diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 13:27:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 13:27:33 +0100 |
| commit | bd34e26b27e9ec83727dedd1c04c40d8a245cfa8 (patch) | |
| tree | b1b9eebb64b644361b38aae2fa00fb2a6b9cfb40 | |
| parent | 9456a8628b4054d11c0b652ee0d4f1b61c3b9464 (diff) | |
| parent | 0e2c3ee9a335d8a0a5edf0509e222e804d7b2619 (diff) | |
| download | ffmpeg-bd34e26b27e9ec83727dedd1c04c40d8a245cfa8.tar.gz | |
Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'
* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
lavc: give a typedeffed name to the AVPacket.side_data struct
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 12 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index eee5073f17..7183dae929 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2012-10-22 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-03-18 - 37c07d4 - lsws 2.5.102 Make gray16 full-scale. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index add0e5ebfc..818172257d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1067,6 +1067,12 @@ enum AVPacketSideDataType { AV_PKT_DATA_METADATA_UPDATE, }; +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 @@ -1123,11 +1129,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 80c71cf709..528c30b9bb 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 52 -#define LIBAVCODEC_VERSION_MICRO 103 +#define LIBAVCODEC_VERSION_MINOR 53 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |