aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-17 22:10:58 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-17 22:14:00 +0200
commit189f2ed902a6044a4eba4a2ef221afefd69d8eec (patch)
tree8950cdc7d5987da9d1b5a951ed425811a340ee77
parent77cd5193a5a5f745769123466b13aa52481436a2 (diff)
downloadffmpeg-189f2ed902a6044a4eba4a2ef221afefd69d8eec.tar.gz
avcodec/libx264: fix MPEG2 support
Found-by: rcombs Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/libx264.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 4487fef736..3e789e5ec3 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;