* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a': avcodec: Add output_picture_number to AVCodecParserContext Conflicts: doc/APIchanges libavcodec/version.h
Unified · Split
| @@ -15,6 +15,9 @@ libavutil: 2012-10-22 · 14 unmodified lines | |||
| 15 | 15 | ||
| 16 | API changes, most recent first: | 16 | API changes, most recent first: |
| 17 | 17 | ||
| 18 | 2013-08-xx - xxxxxxx - lavc 55.11.0 - avcodec.h | ||
| 19 | Add output_picture_number to AVCodecParserContext. | ||
| 20 | |||
| 18 | 2013-07-XX - xxxxxxx - XXXXXXXXXXXXXX - avcodec.h | 21 | 2013-07-XX - xxxxxxx - XXXXXXXXXXXXXX - avcodec.h |
| 19 | Add avcodec_chroma_pos_to_enum() | 22 | Add avcodec_chroma_pos_to_enum() |
| 20 | Add avcodec_enum_to_chroma_pos() | 23 | Add avcodec_enum_to_chroma_pos() |
| @@ -3960,6 +3960,14 @@ typedef struct AVCodecParserContext { · 3959 unmodified lines | |||
| 3960 | * AV_PICTURE_STRUCTURE_TOP_FIELD. | 3960 | * AV_PICTURE_STRUCTURE_TOP_FIELD. |
| 3961 | */ | 3961 | */ |
| 3962 | enum AVPictureStructure picture_structure; | 3962 | enum AVPictureStructure picture_structure; |
| 3963 | |||
| 3964 | /** | ||
| 3965 | * Picture number incremented in presentation or output order. | ||
| 3966 | * This field may be reinitialized at the first picture of a new sequence. | ||
| 3967 | * | ||
| 3968 | * For example, this corresponds to H.264 PicOrderCnt. | ||
| 3969 | */ | ||
| 3970 | int output_picture_number; | ||
| 3963 | } AVCodecParserContext; | 3971 | } AVCodecParserContext; |
| 3964 | 3972 | ||
| 3965 | typedef struct AVCodecParser { | 3973 | typedef struct AVCodecParser { |
| @@ -2768,8 +2768,7 @@ int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc) · 2767 unmodified lines | |||
| 2768 | pic_field_poc[0] = field_poc[0]; | 2768 | pic_field_poc[0] = field_poc[0]; |
| 2769 | if (h->picture_structure != PICT_TOP_FIELD) | 2769 | if (h->picture_structure != PICT_TOP_FIELD) |
| 2770 | pic_field_poc[1] = field_poc[1]; | 2770 | pic_field_poc[1] = field_poc[1]; |
| 2771 | if (pic_poc) | 2771 | *pic_poc = FFMIN(pic_field_poc[0], pic_field_poc[1]); |
| 2772 | *pic_poc = FFMIN(pic_field_poc[0], pic_field_poc[1]); | ||
| 2773 | 2772 | ||
| 2774 | return 0; | 2773 | return 0; |
| 2775 | } | 2774 | } |
| @@ -288,7 +288,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, · 287 unmodified lines | |||
| 288 | h->delta_poc[1] = get_se_golomb(&h->gb); | 288 | h->delta_poc[1] = get_se_golomb(&h->gb); |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | ff_init_poc(h, field_poc, NULL); | 291 | ff_init_poc(h, field_poc, &s->output_picture_number); |
| 292 | 292 | ||
| 293 | if (h->sps.pic_struct_present_flag) { | 293 | if (h->sps.pic_struct_present_flag) { |
| 294 | switch (h->sei_pic_struct) { | 294 | switch (h->sei_pic_struct) { |
| @@ -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 19 | 32 | #define LIBAVCODEC_VERSION_MINOR 20 |
| 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, \ |