[FFmpeg-devel] [PATCH 2/2] h264dec: Remove mpegvideo dependency, it's not needed any more

[James Almer]

On 11/18/2017 3:11 PM, Kieran Kunhya wrote:
> $subj
> 

> From 5f9073ba61c4cb8eeb933e9e461b5d1dfe58fe13 Mon Sep 17 00:00:00 2001
> From: Kieran Kunhya <kierank at obe.tv>
> Date: Sat, 18 Nov 2017 18:06:01 +0000
> Subject: [PATCH 2/2] h264dec: Remove mpegvideo dependency, it's not needed any
>  more
> 
> ---
>  libavcodec/h264dec.c | 15 ++++++---------
>  1 file changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
> index be187eb5f4..f60e5bfbd4 100644
> --- a/libavcodec/h264dec.c
> +++ b/libavcodec/h264dec.c
> @@ -50,7 +50,6 @@
>  #include "mathops.h"
>  #include "me_cmp.h"
>  #include "mpegutils.h"
> -#include "mpeg4video.h"
>  #include "profiles.h"
>  #include "rectangle.h"
>  #include "thread.h"
> @@ -913,14 +912,12 @@ static int finalize_frame(H264Context *h, AVFrame *dst, H264Picture *out, int *g
>  
>          *got_frame = 1;
>  
> -        if (CONFIG_MPEGVIDEO) {
> -            ff_print_debug_info2(h->avctx, dst, NULL,
> -                                 out->mb_type,
> -                                 out->qscale_table,
> -                                 out->motion_val,
> -                                 NULL,
> -                                 h->mb_width, h->mb_height, h->mb_stride, 1);
> -        }
> +        ff_print_debug_info2(h->avctx, dst, NULL,

Don't remove the CONFIG_MPEGVIDEO check. h264_decoder does not pull
mpegvideo in configure.
You can still remove mpeg4video.h with the check in place. CONFIG_ and
HAVE_ defines are from config.h

> +                             out->mb_type,
> +                             out->qscale_table,
> +                             out->motion_val,
> +                             NULL,
> +                             h->mb_width, h->mb_height, h->mb_stride, 1);
>      }
>  
>      return 0;
> -- 
> 2.11.0.windows.1
>