Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'

* commit '674fa49110a661694188a958be13d529b7c8c5dd': avconv: do not call avcodec_get_frame_defaults() Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · e22e943ef9
parent 409a143e4b 674fa49110
commit e22e943ef9
1 changed files with 1 additions and 2 deletions
--- a/ffmpeg.c
+++ b/ffmpeg.c
@ -1080,8 +1080,7 @@ static int reap_filters(void)

        if (!ost->filtered_frame && !(ost->filtered_frame = av_frame_alloc())) {
            return AVERROR(ENOMEM);
-        } else
-            avcodec_get_frame_defaults(ost->filtered_frame);
+        }
        filtered_frame = ost->filtered_frame;

        while (1) {