[SCM] libav/experimental: lavc: give a typedeffed name to the AVPacket.side_data struct

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:02:22 UTC 2014


The following commit has been merged in the experimental branch:
commit 0e2c3ee9a335d8a0a5edf0509e222e804d7b2619
Author: Anton Khirnov <anton at khirnov.net>
Date:   Wed Feb 19 12:00:03 2014 +0100

    lavc: give a typedeffed name to the AVPacket.side_data struct

diff --git a/doc/APIchanges b/doc/APIchanges
index 38d18bc..cfa3068 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,10 @@ libavutil:     2013-12-xx
 
 API changes, most recent first:
 
+2014-02-xx - xxxxxxx - lavc 55.35.0 - avcodec.h
+  Give the name AVPacketSideData to the previously anonymous struct used for
+  AVPacket.side_data.
+
 2014-xx-xx - xxxxxxx - lavu 53.06.0 - pixfmt.h
   Add RGBA64 pixel format and variants.
 
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7beb277..a870a2b 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -925,6 +925,12 @@ enum AVPacketSideDataType {
     AV_PKT_DATA_H263_MB_INFO,
 };
 
+typedef struct AVPacketSideData {
+    uint8_t *data;
+    int      size;
+    enum AVPacketSideDataType type;
+} AVPacketSideData;
+
 /**
  * This structure stores compressed data. It is typically exported by demuxers
  * and then passed as input to decoders, or received as output from encoders and
@@ -981,11 +987,7 @@ typedef struct AVPacket {
      * Additional packet data that can be provided by the container.
      * Packet can contain several types of side information.
      */
-    struct {
-        uint8_t *data;
-        int      size;
-        enum AVPacketSideDataType type;
-    } *side_data;
+    AVPacketSideData *side_data;
     int side_data_elems;
 
     /**
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 5ab49d5..d2f80ad 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,8 +29,8 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR 34
-#define LIBAVCODEC_VERSION_MICRO  1
+#define LIBAVCODEC_VERSION_MINOR 35
+#define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list