[FFmpeg-devel] [PATCH 01/15] avformat/asf: Move ff_asf_audio_conceal_none to its only user

[Andreas Rheinhardt]

Andreas Rheinhardt:
> It is only used inside code guarded by #ifdef DEBUG, i.e. it is normally
> unused.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> ---
>  libavformat/asf.c      | 6 ------
>  libavformat/asf.h      | 1 -
>  libavformat/asfdec_f.c | 8 +++++++-
>  3 files changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/libavformat/asf.c b/libavformat/asf.c
> index 719cae9da5..f1f171e6f6 100644
> --- a/libavformat/asf.c
> +++ b/libavformat/asf.c
> @@ -40,12 +40,6 @@ const ff_asf_guid ff_asf_audio_stream = {
>      0x40, 0x9E, 0x69, 0xF8, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B
>  };
>  
> -const ff_asf_guid ff_asf_audio_conceal_none = {
> -    // 0x40, 0xa4, 0xf1, 0x49, 0x4ece, 0x11d0, 0xa3, 0xac, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6
> -    // New value lifted from avifile
> -    0x00, 0x57, 0xfb, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xa8, 0xfd, 0x00, 0x80, 0x5f, 0x5c, 0x44, 0x2b
> -};
> -
>  const ff_asf_guid ff_asf_audio_conceal_spread = {
>      0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20
>  };
> diff --git a/libavformat/asf.h b/libavformat/asf.h
> index a30d3bb23b..bce820efae 100644
> --- a/libavformat/asf.h
> +++ b/libavformat/asf.h
> @@ -74,7 +74,6 @@ extern const ff_asf_guid ff_asf_file_header;
>  extern const ff_asf_guid ff_asf_stream_header;
>  extern const ff_asf_guid ff_asf_ext_stream_header;
>  extern const ff_asf_guid ff_asf_audio_stream;
> -extern const ff_asf_guid ff_asf_audio_conceal_none;
>  extern const ff_asf_guid ff_asf_audio_conceal_spread;
>  extern const ff_asf_guid ff_asf_video_stream;
>  extern const ff_asf_guid ff_asf_jfif_media;
> diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c
> index b584f60195..1484b544d9 100644
> --- a/libavformat/asfdec_f.c
> +++ b/libavformat/asfdec_f.c
> @@ -143,6 +143,12 @@ static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */
>      0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2
>  };
>  
> +static const ff_asf_guid asf_audio_conceal_none = {
> +    // 0x40, 0xa4, 0xf1, 0x49, 0x4ece, 0x11d0, 0xa3, 0xac, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6
> +    // New value lifted from avifile
> +    0x00, 0x57, 0xfb, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xa8, 0xfd, 0x00, 0x80, 0x5f, 0x5c, 0x44, 0x2b
> +};
> +
>  #define PRINT_IF_GUID(g, cmp) \
>      if (!ff_guidcmp(g, &cmp)) \
>          av_log(NULL, AV_LOG_TRACE, "(GUID: %s) ", # cmp)
> @@ -154,7 +160,7 @@ static void print_guid(ff_asf_guid *g)
>      else PRINT_IF_GUID(g, ff_asf_file_header);
>      else PRINT_IF_GUID(g, ff_asf_stream_header);
>      else PRINT_IF_GUID(g, ff_asf_audio_stream);
> -    else PRINT_IF_GUID(g, ff_asf_audio_conceal_none);
> +    else PRINT_IF_GUID(g, asf_audio_conceal_none);
>      else PRINT_IF_GUID(g, ff_asf_video_stream);
>      else PRINT_IF_GUID(g, ff_asf_video_conceal_none);
>      else PRINT_IF_GUID(g, ff_asf_command_stream);
> 
Will apply this patchset tomorrow unless there are objections.

- Andreas