[Ffmpeg-cvslog] r6954 - in trunk: libavcodec/avcodec.h libavcodec/faad.c libavformat/avidec.c libavformat/matroska.c libavformat/riff.c libavformat/rtp.c libavformat/rtsp.c

[Michael Niedermayer]

Hi

On Thu, Nov 09, 2006 at 03:10:17PM +0100, Baptiste Coudurier wrote:
> Hi
> 
> Alex Beregszaszi wrote:
> > Hi,
> > 
> >> get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to
> >> CODEC_ID_AAC where used
> >>
> >> Modified: trunk/libavcodec/avcodec.h
> >> =====================================================================
> >> ========= --- trunk/libavcodec/avcodec.h	(original)
> >> +++ trunk/libavcodec/avcodec.h	Thu Nov  9 12:37:30 2006
> >> @@ -206,7 +206,9 @@
> >>      CODEC_ID_MP2= 0x15000,
> >>      CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3
> >>      decoding */ CODEC_ID_AAC,
> >> +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
> >>      CODEC_ID_MPEG4AAC,
> >> +#endif
> >>      CODEC_ID_AC3,
> >>      CODEC_ID_DTS,
> >>      CODEC_ID_VORBIS,
> > 
> > What does Michaels says to this? Doesnt this breaks binary
> > compatibility?
> > 
> 
> Yes it will when lavc version will bump to a new major version: 52.

and such a bump will only happen if we do break binary compatibility
so these ifdefs shouldnt do any harm

btw, can we attribute_deprecate specific enum entries?

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In the past you could go to a library and read, borrow or copy any book
Today you'd get arrested for mere telling someone where the library is