eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-25 00:10:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'

Browse Source 
* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1':
  avcodec: Add picture structure information to AVCodecParserContext.

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-24 11:51:58 +02:00
parent ac0ade2645 b493847df4
commit 0c25c398da
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/avcodec.h
View File

@@ -3788,6 +3788,13 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
* @{
*/
enum AVPictureStructure {
AV_PICTURE_STRUCTURE_UNKNOWN, //< unknown
AV_PICTURE_STRUCTURE_TOP_FIELD, //< coded as top field
AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
AV_PICTURE_STRUCTURE_FRAME, //< coded as frame
};
typedef struct AVCodecParserContext {
void *priv_data;
struct AVCodecParser *parser;
@@ -3924,6 +3931,16 @@ typedef struct AVCodecParserContext {
int duration;
enum AVFieldOrder field_order;
/**
* Indicate whether a picture is coded as a frame, top field or bottom field.
*
* For example, H.264 field_pic_flag equal to 0 corresponds to
* AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
* equal to 1 and bottom_field_flag equal to 0 corresponds to
* AV_PICTURE_STRUCTURE_TOP_FIELD.
*/
enum AVPictureStructure picture_structure;
} AVCodecParserContext;
typedef struct AVCodecParser {