[SCM] libav/experimental: automatically remove mess

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:44:55 UTC 2013


The following commit has been merged in the experimental branch:
commit a1043f9c50a07de5e9eee9e3b012e5a181eb5733
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Aug 16 07:53:03 2005 +0000

    automatically remove mess
    
    Originally committed as revision 4529 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8fadeb7..ab00920 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1885,7 +1885,9 @@ typedef struct AVCodec {
     int (*decode)(AVCodecContext *, void *outdata, int *outdata_size,
                   uint8_t *buf, int buf_size);
     int capabilities;
+#if LIBAVCODEC_VERSION_INT < ((50<<16)+(0<<8)+0)
     void *dummy; // FIXME remove next time we break binary compatibility
+#endif
     struct AVCodec *next;
     void (*flush)(AVCodecContext *);
     const AVRational *supported_framerates; ///array of supported framerates, or NULL if any, array is terminated by {0,0}

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list