[FFmpeg-cvslog] avcodec/libx264: fix MPEG2 support

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 17 22:10:58 2015 +0200| [189f2ed902a6044a4eba4a2ef221afefd69d8eec] | committer: Michael Niedermayer

avcodec/libx264: fix MPEG2 support

Found-by: rcombs
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=189f2ed902a6044a4eba4a2ef221afefd69d8eec
---

 libavcodec/libx264.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 4487fef..3e789e5 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -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;