[FFmpeg-devel,1/4] get_bits: move check_marker() to mpegvideodec.h

It is only used by mpegvideo-based decoders - specifically mpeg12, intelh263,
ituh263, mpeg4video.
---
Resending the set rebased against current master (there conflicts with
2d764069be3b4092dc986467660607d922023332) and with patch 04 skipped, as
Andreas pointed out issues with it. It is not needed by the other
patches, so can be left out for now.

Apparently Paul has withrawn his objections and Lynne approved the
previous iteration on IRC, so will push this in a few days if nobody
objects.
---
 libavcodec/get_bits.h     | 10 ----------
 libavcodec/intelh263dec.c |  1 +
 libavcodec/ituh263dec.c   |  1 +
 libavcodec/mpegvideodec.h | 10 ++++++++++
 4 files changed, 12 insertions(+), 10 deletions(-)

Anton Khirnov:
> It is only used by mpegvideo-based decoders - specifically mpeg12, intelh263,
> ituh263, mpeg4video.
> ---
> Resending the set rebased against current master (there conflicts with
> 2d764069be3b4092dc986467660607d922023332) and with patch 04 skipped, as
> Andreas pointed out issues with it. It is not needed by the other
> patches, so can be left out for now.
> 
> Apparently Paul has withrawn his objections and Lynne approved the
> previous iteration on IRC, so will push this in a few days if nobody
> objects.
> ---
>  libavcodec/get_bits.h     | 10 ----------
>  libavcodec/intelh263dec.c |  1 +
>  libavcodec/ituh263dec.c   |  1 +
>  libavcodec/mpegvideodec.h | 10 ++++++++++
>  4 files changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
> index 16f8af5107..9f2b1784d5 100644
> --- a/libavcodec/get_bits.h
> +++ b/libavcodec/get_bits.h
> @@ -610,16 +610,6 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n)
>      }
>  }
>  
> -static inline int check_marker(void *logctx, GetBitContext *s, const char *msg)
> -{
> -    int bit = get_bits1(s);
> -    if (!bit)
> -        av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n",
> -               get_bits_count(s) - 1, s->size_in_bits, msg);
> -
> -    return bit;
> -}
> -
>  static inline int init_get_bits_xe(GetBitContext *s, const uint8_t *buffer,
>                                     int bit_size, int is_le)
>  {
> diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
> index e7e821d3b3..ded0a7f618 100644
> --- a/libavcodec/intelh263dec.c
> +++ b/libavcodec/intelh263dec.c
> @@ -21,6 +21,7 @@
>  #include "codec_internal.h"
>  #include "mpegutils.h"
>  #include "mpegvideo.h"
> +#include "mpegvideodec.h"
>  #include "h263data.h"
>  #include "h263dec.h"
>  #include "mpegvideodata.h"
> diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
> index f01c942f04..af054360d8 100644
> --- a/libavcodec/ituh263dec.c
> +++ b/libavcodec/ituh263dec.c
> @@ -48,6 +48,7 @@
>  #include "rv10dec.h"
>  #include "mpeg4video.h"
>  #include "mpegvideodata.h"
> +#include "mpegvideodec.h"
>  #include "mpeg4videodec.h"
>  
>  // The defines below define the number of bits that are read at once for
> diff --git a/libavcodec/mpegvideodec.h b/libavcodec/mpegvideodec.h
> index 1af8ebac36..10394a616c 100644
> --- a/libavcodec/mpegvideodec.h
> +++ b/libavcodec/mpegvideodec.h
> @@ -67,4 +67,14 @@ static inline int mpeg_get_qscale(MpegEncContext *s)
>          return qscale << 1;
>  }
>  
> +static inline int check_marker(void *logctx, GetBitContext *s, const char *msg)
> +{
> +    int bit = get_bits1(s);
> +    if (!bit)
> +        av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n",
> +               get_bits_count(s) - 1, s->size_in_bits, msg);
> +
> +    return bit;
> +}
> +
>  #endif /* AVCODEC_MPEGVIDEODEC_H */

LGTM.

- Andreas

Anton Khirnov:
> It is only used by mpegvideo-based decoders - specifically mpeg12, intelh263,
> ituh263, mpeg4video.
> ---
> Resending the set rebased against current master (there conflicts with
> 2d764069be3b4092dc986467660607d922023332) and with patch 04 skipped, as
> Andreas pointed out issues with it. It is not needed by the other
> patches, so can be left out for now.
> 
> Apparently Paul has withrawn his objections and Lynne approved the
> previous iteration on IRC, so will push this in a few days if nobody
> objects.
> ---
>  libavcodec/get_bits.h     | 10 ----------
>  libavcodec/intelh263dec.c |  1 +
>  libavcodec/ituh263dec.c   |  1 +
>  libavcodec/mpegvideodec.h | 10 ++++++++++
>  4 files changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
> index 16f8af5107..9f2b1784d5 100644
> --- a/libavcodec/get_bits.h
> +++ b/libavcodec/get_bits.h
> @@ -610,16 +610,6 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n)
>      }
>  }
>  
> -static inline int check_marker(void *logctx, GetBitContext *s, const char *msg)
> -{
> -    int bit = get_bits1(s);
> -    if (!bit)
> -        av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n",
> -               get_bits_count(s) - 1, s->size_in_bits, msg);
> -
> -    return bit;
> -}
> -
>  static inline int init_get_bits_xe(GetBitContext *s, const uint8_t *buffer,
>                                     int bit_size, int is_le)
>  {
> diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
> index e7e821d3b3..ded0a7f618 100644
> --- a/libavcodec/intelh263dec.c
> +++ b/libavcodec/intelh263dec.c
> @@ -21,6 +21,7 @@
>  #include "codec_internal.h"
>  #include "mpegutils.h"
>  #include "mpegvideo.h"
> +#include "mpegvideodec.h"
>  #include "h263data.h"
>  #include "h263dec.h"
>  #include "mpegvideodata.h"
> diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
> index f01c942f04..af054360d8 100644
> --- a/libavcodec/ituh263dec.c
> +++ b/libavcodec/ituh263dec.c
> @@ -48,6 +48,7 @@
>  #include "rv10dec.h"
>  #include "mpeg4video.h"
>  #include "mpegvideodata.h"
> +#include "mpegvideodec.h"
>  #include "mpeg4videodec.h"
>  
>  // The defines below define the number of bits that are read at once for
> diff --git a/libavcodec/mpegvideodec.h b/libavcodec/mpegvideodec.h
> index 1af8ebac36..10394a616c 100644
> --- a/libavcodec/mpegvideodec.h
> +++ b/libavcodec/mpegvideodec.h
> @@ -67,4 +67,14 @@ static inline int mpeg_get_qscale(MpegEncContext *s)
>          return qscale << 1;
>  }
>  
> +static inline int check_marker(void *logctx, GetBitContext *s, const char *msg)
> +{
> +    int bit = get_bits1(s);
> +    if (!bit)
> +        av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n",
> +               get_bits_count(s) - 1, s->size_in_bits, msg);
> +
> +    return bit;
> +}
> +
>  #endif /* AVCODEC_MPEGVIDEODEC_H */

I think you can now remove log.h from get_bits.h. That always bothered me.

- Andreas