]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/libx264: fix MPEG2 support
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 20:10:58 +0000 (22:10 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 20:14:00 +0000 (22:14 +0200)
Found-by: rcombs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/libx264.c

index 4487fef7365d9cf0bbe19a8d4c1ecefe01769641..3e789e5ec3412dabccd4af8331e5ee8bc3a60ba9 100644 (file)
@@ -389,9 +389,8 @@ static av_cold int X264_init(AVCodecContext *avctx)
         x4->params.b_mpeg2 = 1;
         x264_param_default_mpeg2(&x4->params);
     } else
-#else
-    x264_param_default(&x4->params);
 #endif
+    x264_param_default(&x4->params);
 
     x4->params.b_deblocking_filter         = avctx->flags & CODEC_FLAG_LOOP_FILTER;