starred/ffmpeg-rockchip-nyanmisaka
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-24 02:20:56 +01:00
Code Issues Projects Packages Wiki Activity Actions

Merge commit '84f131921f'

Browse source 
* commit '84f131921f':
  avplay: do not call avcodec_get_frame_defaults().

Conflicts:
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-11 23:49:44 +01:00
commit 5a15bd6f2f
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ffplay.c
View file

@ -2167,7 +2167,6 @@ static int audio_decode_frame(VideoState *is)
return AVERROR(ENOMEM);
} else {
av_frame_unref(is->frame);
avcodec_get_frame_defaults(is->frame);
}
if (is->audioq.serial != is->audio_pkt_temp_serial)