generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'

Browse Source 
* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
  avcodec: Add output_picture_number to AVCodecParserContext

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-03 10:48:11 +02:00
commit 82fdfe8e51
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first: API changes, most recent first:
2013-08-xx - xxxxxxx - lavc 55.11.0 - avcodec.h
Add output_picture_number to AVCodecParserContext.
2013-07-XX - xxxxxxx - XXXXXXXXXXXXXX - avcodec.h 2013-07-XX - xxxxxxx - XXXXXXXXXXXXXX - avcodec.h
Add avcodec_chroma_pos_to_enum() Add avcodec_chroma_pos_to_enum()
Add avcodec_enum_to_chroma_pos() Add avcodec_enum_to_chroma_pos()

8
libavcodec/avcodec.h
View File

@ -3960,6 +3960,14 @@ typedef struct AVCodecParserContext {
* AV_PICTURE_STRUCTURE_TOP_FIELD. * AV_PICTURE_STRUCTURE_TOP_FIELD.
*/ */
enum AVPictureStructure picture_structure; enum AVPictureStructure picture_structure;
/**
* Picture number incremented in presentation or output order.
* This field may be reinitialized at the first picture of a new sequence.
*
* For example, this corresponds to H.264 PicOrderCnt.
*/
int output_picture_number;
} AVCodecParserContext; } AVCodecParserContext;
typedef struct AVCodecParser { typedef struct AVCodecParser {

1
libavcodec/h264.c
View File

@ -2768,7 +2768,6 @@ int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc)
pic_field_poc[0] = field_poc[0]; pic_field_poc[0] = field_poc[0];
if (h->picture_structure != PICT_TOP_FIELD) if (h->picture_structure != PICT_TOP_FIELD)
pic_field_poc[1] = field_poc[1]; pic_field_poc[1] = field_poc[1];
if (pic_poc)
*pic_poc = FFMIN(pic_field_poc[0], pic_field_poc[1]); *pic_poc = FFMIN(pic_field_poc[0], pic_field_poc[1]);
return 0; return 0;

2
libavcodec/h264_parser.c
View File

@ -288,7 +288,7 @@ static inline int parse_nal_units(AVCodecParserContext *s,
h->delta_poc[1] = get_se_golomb(&h->gb); h->delta_poc[1] = get_se_golomb(&h->gb);
} }
ff_init_poc(h, field_poc, NULL); ff_init_poc(h, field_poc, &s->output_picture_number);
if (h->sps.pic_struct_present_flag) { if (h->sps.pic_struct_present_flag) {
switch (h->sei_pic_struct) { switch (h->sei_pic_struct) {

2
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 19 #define LIBAVCODEC_VERSION_MINOR 20
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \