Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'

* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1': avcodec: Add picture structure information to AVCodecParserContext. Conflicts: doc/APIchanges libavcodec/version.h

Michael Niedermayer committed 13 years ago

Commit 0c25c392 parents ac0ade2 b4938473 files · +22 −1Browse files

Unified · Split

3 files

doc/APIchanges +4 −0
libavcodec/avcodec.h +17 −0
libavcodec/version.h +1 −1

doc/APIchanges+4−0

@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18
		19	2013-05-24 - xxxxxxx - lavc 55.7.0 - avcodec.h
		20	Add picture_structure to AVCodecParserContext.
		21
18	2013-05-17 - xxxxxxx - lavu 52.33.100 - opt.h	22	2013-05-17 - xxxxxxx - lavu 52.33.100 - opt.h
19	Add AV_OPT_TYPE_COLOR value to AVOptionType enum.	23	Add AV_OPT_TYPE_COLOR value to AVOptionType enum.
20		24

libavcodec/avcodec.h+17−0

@@ -3788,6 +3788,13 @@ int avcodec_decode_subtitle2(AVCodecContext avctx, AVSubtitle sub, · 3787 unmodified lines
3788	* @{	3788	* @{
3789	*/	3789	*/
3790		3790
		3791	enum AVPictureStructure {
		3792	AV_PICTURE_STRUCTURE_UNKNOWN, //< unknown
		3793	AV_PICTURE_STRUCTURE_TOP_FIELD, //< coded as top field
		3794	AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
		3795	AV_PICTURE_STRUCTURE_FRAME, //< coded as frame
		3796	};
		3797
3791	typedef struct AVCodecParserContext {	3798	typedef struct AVCodecParserContext {
3792	void *priv_data;	3799	void *priv_data;
3793	struct AVCodecParser *parser;	3800	struct AVCodecParser *parser;
@@ -3924,6 +3931,16 @@ typedef struct AVCodecParserContext { · 130 unmodified lines
3924	int duration;	3931	int duration;
3925		3932
3926	enum AVFieldOrder field_order;	3933	enum AVFieldOrder field_order;
		3934
		3935	/**
		3936	* Indicate whether a picture is coded as a frame, top field or bottom field.
		3937	*
		3938	* For example, H.264 field_pic_flag equal to 0 corresponds to
		3939	* AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
		3940	* equal to 1 and bottom_field_flag equal to 0 corresponds to
		3941	* AV_PICTURE_STRUCTURE_TOP_FIELD.
		3942	*/
		3943	enum AVPictureStructure picture_structure;
3927	} AVCodecParserContext;	3944	} AVCodecParserContext;
3928		3945
3929	typedef struct AVCodecParser {	3946	typedef struct AVCodecParser {

libavcodec/version.h+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	#include "libavutil/avutil.h"	29	#include "libavutil/avutil.h"
30		30
31	#define LIBAVCODEC_VERSION_MAJOR 55	31	#define LIBAVCODEC_VERSION_MAJOR 55
32	#define LIBAVCODEC_VERSION_MINOR 11	32	#define LIBAVCODEC_VERSION_MINOR 12
33	#define LIBAVCODEC_VERSION_MICRO 100	33	#define LIBAVCODEC_VERSION_MICRO 100
34		34
35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \	35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code