Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619': lavc: give a typedeffed name to the AVPacket.side_data struct Conflicts: doc/APIchanges libavcodec/version.h

Michael Niedermayer committed 12 years ago

Commit bd34e262 parents 9456a86 0e2c3ee3 files · +13 −7Browse files

Unified · Split

3 files

doc/APIchanges +4 −0
libavcodec/avcodec.h +7 −5
libavcodec/version.h +2 −2

doc/APIchanges+4−0

@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2014-02-xx - xxxxxxx - lavc 55.35.0 - avcodec.h
	19	+ Give the name AVPacketSideData to the previously anonymous struct used for
	20	+ AVPacket.side_data.
	21	+
18	22	2014-03-18 - 37c07d4 - lsws 2.5.102
19	23	Make gray16 full-scale.
20	24

libavcodec/avcodec.h+7−5

@@ -1067,6 +1067,12 @@ enum AVPacketSideDataType { · 1066 unmodified lines
1067	1067	AV_PKT_DATA_METADATA_UPDATE,
1068	1068	};
1069	1069
	1070	+typedef struct AVPacketSideData {
	1071	+ uint8_t *data;
	1072	+ int size;
	1073	+ enum AVPacketSideDataType type;
	1074	+} AVPacketSideData;
	1075	+
1070	1076	/**
1071	1077	* This structure stores compressed data. It is typically exported by demuxers
1072	1078	* and then passed as input to decoders, or received as output from encoders and
@@ -1123,11 +1129,7 @@ typedef struct AVPacket { · 50 unmodified lines
1123	1129	* Additional packet data that can be provided by the container.
1124	1130	* Packet can contain several types of side information.
1125	1131	*/
1126		− struct {
1127		− uint8_t *data;
1128		− int size;
1129		− enum AVPacketSideDataType type;
1130		− } *side_data;
	1132	+ AVPacketSideData *side_data;
1131	1133	int side_data_elems;
1132	1134
1133	1135	/**

libavcodec/version.h+2−2

@@ -29,8 +29,8 @@ · 28 unmodified lines
29	29	#include "libavutil/version.h"
30	30
31	31	#define LIBAVCODEC_VERSION_MAJOR 55
32		−#define LIBAVCODEC_VERSION_MINOR 52
33		−#define LIBAVCODEC_VERSION_MICRO 103
	32	+#define LIBAVCODEC_VERSION_MINOR 53
	33	+#define LIBAVCODEC_VERSION_MICRO 100
34	34
35	35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
36	36	LIBAVCODEC_VERSION_MINOR, \

Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code