[FFmpeg-devel] [PATCH] lavc: deprecate VIMA decoder

[Michael Niedermayer]

On Tue, Feb 10, 2015 at 12:14:23PM +0000, Paul B Mahol wrote:
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
>  doc/APIchanges          | 3 +++
>  libavcodec/allcodecs.c  | 2 ++
>  libavcodec/avcodec.h    | 2 ++
>  libavcodec/codec_desc.c | 2 ++
>  libavcodec/version.h    | 3 +++
>  libavcodec/vima.c       | 2 ++
>  6 files changed, 14 insertions(+)
> 
> diff --git a/doc/APIchanges b/doc/APIchanges
> index e46124a..25f8940 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -15,6 +15,9 @@ libavutil:     2014-08-09
>  
>  API changes, most recent first:
>  
> +2015-01-xx - xxxxxxx - lavc 56.21.102
> +  Deprecate VIMA decoder.
> +
>  2015-01-xx - xxxxxxx - lavc 56.12.0, lavu 54.8.0 - avcodec.h, frame.h
>    Add AV_PKT_DATA_AUDIO_SERVICE_TYPE and AV_FRAME_DATA_AUDIO_SERVICE_TYPE for
>    storing the audio service type as side data.
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index 2fe3609..59fe681 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -477,7 +477,9 @@ void avcodec_register_all(void)
>      REGISTER_DECODER(ADPCM_VIMA,        adpcm_vima);
>      REGISTER_DECODER(ADPCM_XA,          adpcm_xa);
>      REGISTER_ENCDEC (ADPCM_YAMAHA,      adpcm_yamaha);
> +#if FF_API_VIMA_DECODER
>      REGISTER_DECODER(VIMA,              vima);
> +#endif
>  
>      /* subtitles */
>      REGISTER_ENCDEC (SSA,               ssa);
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 87b53a2..1266799 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -390,7 +390,9 @@ enum AVCodecID {
>      AV_CODEC_ID_ADPCM_IMA_APC,
>      AV_CODEC_ID_ADPCM_VIMA_DEPRECATED,
>      AV_CODEC_ID_ADPCM_VIMA = MKBETAG('V','I','M','A'),
> +#ifdef FF_API_VIMA_DECODER

this probably should be #if instead of #ifdef

rest LGTM

Thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

What does censorship reveal? It reveals fear. -- Julian Assange
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150210/543d744c/attachment.asc>