1. ffmpeg
  2. Commit c21440637e189a3c8f12670927e4a7b8158be7d8
Browse code

libavcodec: Define a side data type for new extradata

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 195c123cc87bb46efbadb48b2f756ae49bdb6774)

Conflicts:

libavcodec/version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Martin Storsjö authored on 2011/12/15 23:11:49
Showing 2 changed files
libavcodec/avcodec.h
History View file @ c214406
... ... 
@@ -876,6 +876,7 @@ typedef struct AVPanScan{
876 876
877 877 
 enum AVPacketSideDataType {
878 878 
     AV_PKT_DATA_PALETTE,
879 
+    AV_PKT_DATA_NEW_EXTRADATA,
879 880 
 };
880 881
881 882 
 typedef struct AVPacket {
libavcodec/version.h
History View file @ c214406
... ... 
@@ -22,7 +22,7 @@
22 22
23 23 
 #define LIBAVCODEC_VERSION_MAJOR 53
24 24 
 #define LIBAVCODEC_VERSION_MINOR 42
25 
-#define LIBAVCODEC_VERSION_MICRO  0
25 
+#define LIBAVCODEC_VERSION_MICRO  1
26 26
27 27 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
28 28 
                                                LIBAVCODEC_VERSION_MINOR, \