Make avcodec_string() and av_get_bits_per_sample() report the sample size for CODEC_I...

[ffmpeg] / libavcodec / libx264.c

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index af17705de461a5cda4a9a91dccd737030b2ee686..e885f074f5ed6a3e0a2a8dc2f878faef11acc78a 100644 (file)
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -220,6 +220,8 @@ X264_init(AVCodecContext *avctx)
         x4->params.analyse.i_me_method = X264_ME_UMH;
     else if(avctx->me_method == ME_FULL)
         x4->params.analyse.i_me_method = X264_ME_ESA;
+    else if(avctx->me_method == ME_TESA)
+        x4->params.analyse.i_me_method = X264_ME_TESA;
     else x4->params.analyse.i_me_method = X264_ME_HEX;
 
     x4->params.analyse.i_me_range = avctx->me_range;
@@ -260,6 +262,8 @@ X264_init(AVCodecContext *avctx)
 
     x4->params.i_threads = avctx->thread_count;
 
+    x4->params.b_interlaced = avctx->flags & CODEC_FLAG_INTERLACED_DCT;
+
     if(avctx->flags & CODEC_FLAG_GLOBAL_HEADER){
         x4->params.b_repeat_headers = 0;
     }
@@ -297,5 +301,5 @@ AVCodec libx264_encoder = {
     .close = X264_close,
     .capabilities = CODEC_CAP_DELAY,
     .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE },
-    .long_name = "libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10",
+    .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
 };