diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 11:51:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 11:51:58 +0200 |
| commit | 0c25c398dab033cda0e28ca074505e47d7480d76 (patch) | |
| tree | aeec8f420151ce0d6ad7f35d9b511cf8d23b9255 /libavcodec | |
| parent | ac0ade26458dfe6f37c3f6c1078483315948fd9c (diff) | |
| parent | b493847df4ff8ce46f258749e4a3f304696b34c1 (diff) | |
| download | ffmpeg-0c25c398dab033cda0e28ca074505e47d7480d76.tar.gz | |
Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'
* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1':
avcodec: Add picture structure information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 17 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7ce9df427a..93d63e8873 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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 { diff --git a/libavcodec/version.h b/libavcodec/version.h index 7d34f8a6cb..44c9f927ce 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 11 +#define LIBAVCODEC_VERSION_MINOR 12 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |