aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-02-19 12:00:03 +0100
committerAnton Khirnov <anton@khirnov.net>2014-03-24 06:07:50 +0100
commit0e2c3ee9a335d8a0a5edf0509e222e804d7b2619 (patch)
treee619cc66ad731d9dfb7dce11147d8183ef7df98d /libavcodec
parent54f7881615a5ce2f89283e7ac2015b8ef141537c (diff)
downloadffmpeg-0e2c3ee9a335d8a0a5edf0509e222e804d7b2619.tar.gz
lavc: give a typedeffed name to the AVPacket.side_data struct
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h12
-rw-r--r--libavcodec/version.h4
2 files changed, 9 insertions, 7 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7beb2772d7..a870a2b9fb 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 5ab49d5cd9..d2f80ad442 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, \