[FFmpeg-devel] [PATCH 13/13] lavc: remove the remaining deprecated cruft

[Anton Khirnov]

On Thu, Feb 03, 2011 at 05:42:04PM +0100, Michael Niedermayer wrote:
> On Thu, Feb 03, 2011 at 04:35:44PM +0100, Anton Khirnov wrote:
> > ---
> >  libavcodec/Makefile     |    1 -
> >  libavcodec/avcodec.h    |  102 +----------------------------------------------
> >  libavcodec/dsputil.h    |    8 ----
> >  libavcodec/imgconvert.c |   52 ------------------------
> >  libavcodec/imgconvert.h |   44 --------------------
> >  libavcodec/opt.c        |   65 ------------------------------
> >  libavcodec/options.c    |    3 -
> >  libavcodec/rawdec.c     |    1 -
> >  libavcodec/utils.c      |   28 -------------
> >  libavcodec/xvmc.h       |   20 ---------
> >  10 files changed, 1 insertions(+), 323 deletions(-)
> >  delete mode 100644 libavcodec/imgconvert.h
> >  delete mode 100644 libavcodec/opt.c
> > 
> > diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> > index 0266984..b6d31a3 100644
> > --- a/libavcodec/Makefile
> > +++ b/libavcodec/Makefile
> > @@ -15,7 +15,6 @@ OBJS = allcodecs.o                                                      \
> >         fmtconvert.o                                                     \
> >         imgconvert.o                                                     \
> >         jrevdct.o                                                        \
> > -       opt.o                                                            \
> >         options.o                                                        \
> >         parser.o                                                         \
> >         raw.o                                                            \
> > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> > index ced825a..b8d9720 100644
> > --- a/libavcodec/avcodec.h
> > +++ b/libavcodec/avcodec.h
> > @@ -53,11 +53,7 @@
> >  #define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
> >  #endif
> >  
> > -#if LIBAVCODEC_VERSION_MAJOR < 53
> > -#   define FF_INTERNALC_MEM_TYPE unsigned int
> > -#else
> > -#   define FF_INTERNALC_MEM_TYPE size_t
> > -#endif
> > +#define FF_INTERNALC_MEM_TYPE size_t
> >  
> >  /**
> >   * Identify the syntax and semantics of the bitstream.
> > @@ -137,9 +133,6 @@ enum CodecID {
> >      CODEC_ID_QDRAW,
> >      CODEC_ID_VIXL,
> >      CODEC_ID_QPEG,
> > -#if LIBAVCODEC_VERSION_MAJOR < 53
> > -    CODEC_ID_XVID,
> > -#endif
> >      CODEC_ID_PNG,
> >      CODEC_ID_PPM,
> >      CODEC_ID_PBM,
> 
> Id suggest:
> 
> >      CODEC_ID_VIXL,
> >      CODEC_ID_QPEG,
> > -#if LIBAVCODEC_VERSION_MAJOR < 53
> > -    CODEC_ID_XVID,
> > +    CODEC_ID_UNUSED_INTERNAL,
> > -#endif
> >      CODEC_ID_PNG,
> >      CODEC_ID_PPM,
> 
> and then when adding the next new codec use that ID for it
> you get rid of the cruft and leave the IDs nummerically identical which might
> help debuging older bugreports
done


On Thu, Feb 03, 2011 at 04:52:54PM +0000, M?ns Rullg?rd wrote:
> Anton Khirnov <anton at khirnov.net> writes:
> 
> > -#if LIBAVCODEC_VERSION_MAJOR < 53
> > -#   define FF_INTERNALC_MEM_TYPE unsigned int
> > -#else
> > -#   define FF_INTERNALC_MEM_TYPE size_t
> > -#endif
> > +#define FF_INTERNALC_MEM_TYPE size_t
> 
> Drop the define as well.  The extra indirection no longer serves a purpose.
> 
done


-- 
Anton Khirnov
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-lavc-remove-the-remaining-deprecated-cruft.patch
Type: text/x-diff
Size: 22128 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20110203/11d1a835/attachment.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20110203/11d1a835/attachment.pgp>