diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 12:59:25 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 12:59:25 +0100 |
| commit | c6f1f334cbc50b1821b92afaee13abcd3502b34a (patch) | |
| tree | d1b7a5bd3a9b8a579684c7a987fdaadccccc9c37 | |
| parent | bc66451e5e903698ee0500faf04c1214f3dd157f (diff) | |
| parent | 792b9c9dfcf44b657d7854368d975b5ca3bc22ca (diff) | |
| download | ffmpeg-c6f1f334cbc50b1821b92afaee13abcd3502b34a.tar.gz | |
Merge commit '792b9c9dfcf44b657d7854368d975b5ca3bc22ca'
* commit '792b9c9dfcf44b657d7854368d975b5ca3bc22ca':
h264: set frame_num in start_frame(), not decode_slice_header()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 1639559832..c63e6d608a 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -595,6 +595,7 @@ static int h264_frame_start(H264Context *h) pic->reference = h->droppable ? 0 : h->picture_structure; pic->f->coded_picture_number = h->coded_picture_number++; pic->field_picture = h->picture_structure != PICT_FRAME; + pic->frame_num = h->frame_num; /* * Zero key_frame here; IDR markings per slice in frame or fields are ORed @@ -1665,9 +1666,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } } - if (!h->setup_finished) - h->cur_pic_ptr->frame_num = h->frame_num; // FIXME frame_num cleanup - av_assert1(h->mb_num == h->mb_width * h->mb_height); if (first_mb_in_slice << FIELD_OR_MBAFF_PICTURE(h) >= h->mb_num || first_mb_in_slice >= h->mb_num) { |