diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:48:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:48:11 +0200 |
| commit | 82fdfe8e51c593b484fd590368f2d70ef39f2bf8 (patch) | |
| tree | ff95c2e7a87ca4929a8471e30765b8c7724faea6 /libavcodec/h264_parser.c | |
| parent | 1607a985455287ccae3bfa46393a6cdfc04ce64f (diff) | |
| parent | a8b19271c3b40ac3c3dc769fe248887acf14ba5a (diff) | |
| download | ffmpeg-82fdfe8e51c593b484fd590368f2d70ef39f2bf8.tar.gz | |
Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'
* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
avcodec: Add output_picture_number to AVCodecParserContext
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index db5adf723e..f6bd1b6c06 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -288,7 +288,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, 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) { switch (h->sei_pic_struct) { |