virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-06 08:29:25 +02:00
Code Issues Releases Activity

Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'

Browse Source 
* commit '674fa49110a661694188a958be13d529b7c8c5dd':
  avconv: do not call avcodec_get_frame_defaults()

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-11 23:36:10 +01:00
parent 409a143e4b 674fa49110
commit e22e943ef9
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg.c
View File

@@ -1080,8 +1080,7 @@ static int reap_filters(void)
if (!ost->filtered_frame && !(ost->filtered_frame = av_frame_alloc())) { if (!ost->filtered_frame && !(ost->filtered_frame = av_frame_alloc())) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} else }
avcodec_get_frame_defaults(ost->filtered_frame);
filtered_frame = ost->filtered_frame; filtered_frame = ost->filtered_frame;
while (1) { while (1) {