diff --git a/doc/APIchanges b/doc/APIchanges index 16c14750d9..7d720258c3 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2012-10-22 API changes, most recent first: + +2013-05-24 - xxxxxxx - lavc 55.7.0 - avcodec.h + Add picture_structure to AVCodecParserContext. + 2013-05-17 - xxxxxxx - lavu 52.33.100 - opt.h Add AV_OPT_TYPE_COLOR value to AVOptionType enum. 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, \