[FFmpeg-devel] [PATCH] avcodec/imgconvert: remove deprecation guards for a function that's not declared as such

[wm4]

On Fri, 25 Aug 2017 10:15:05 +0200
Paul B Mahol <onemda at gmail.com> wrote:

> On 8/25/17, wm4 <nfxjfg at googlemail.com> wrote:
> > On Thu, 24 Aug 2017 20:43:11 -0300
> > James Almer <jamrial at gmail.com> wrote:
> >  
> >> Signed-off-by: James Almer <jamrial at gmail.com>
> >> ---
> >> The deprecation seems to have been imported from libav but never made
> >> effective.
> >>
> >>  libavcodec/imgconvert.c | 2 --
> >>  libavcodec/version.h    | 3 ---
> >>  2 files changed, 5 deletions(-)
> >>
> >> diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
> >> index 1547f18966..a349e2a083 100644
> >> --- a/libavcodec/imgconvert.c
> >> +++ b/libavcodec/imgconvert.c
> >> @@ -34,7 +34,6 @@
> >>  #include "libavutil/internal.h"
> >>  #include "libavutil/imgutils.h"
> >>
> >> -#if FF_API_GETCHROMA
> >>  void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int
> >> *h_shift, int *v_shift)
> >>  {
> >>      const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
> >> @@ -42,7 +41,6 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat
> >> pix_fmt, int *h_shift, int
> >>      *h_shift = desc->log2_chroma_w;
> >>      *v_shift = desc->log2_chroma_h;
> >>  }
> >> -#endif
> >>
> >>  int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt,
> >>                               enum AVPixelFormat src_pix_fmt,
> >> diff --git a/libavcodec/version.h b/libavcodec/version.h
> >> index 7473000579..f41b9caa2d 100644
> >> --- a/libavcodec/version.h
> >> +++ b/libavcodec/version.h
> >> @@ -60,9 +60,6 @@
> >>  #ifndef FF_API_AVCODEC_RESAMPLE
> >>  #define FF_API_AVCODEC_RESAMPLE  FF_API_AUDIO_CONVERT
> >>  #endif
> >> -#ifndef FF_API_GETCHROMA
> >> -#define FF_API_GETCHROMA         (LIBAVCODEC_VERSION_MAJOR < 58)
> >> -#endif
> >>  #ifndef FF_API_MISSING_SAMPLE
> >>  #define FF_API_MISSING_SAMPLE    (LIBAVCODEC_VERSION_MAJOR < 58)
> >>  #endif  
> >
> > I don't agree with this.  
> 
> Why?

The function should be removed.