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.c | |
| parent | 1607a985455287ccae3bfa46393a6cdfc04ce64f (diff) | |
| parent | a8b19271c3b40ac3c3dc769fe248887acf14ba5a (diff) | |
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.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 2cb98df1f9..c08720876b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2768,8 +2768,7 @@ int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc) pic_field_poc[0] = field_poc[0]; if (h->picture_structure != PICT_TOP_FIELD) 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; } |