diff options
author | Clément Bœsch <u@pkh.me> | 2016-06-12 17:06:58 +0300 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2016-06-12 20:01:43 +0300 |
commit | bd3fd467febe92300e0ebf8ff13c193f9236479a (patch) | |
tree | e2a4382598405ce35492ec3c69e007e36f9b5e6c /libavcodec/h264_refs.c | |
parent | 65d5f32fd7d234a9b08e3743593de0a72af7c03c (diff) | |
parent | c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8 (diff) |
Merge commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8'
* commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8':
h264: factor out calculating the POC count into a separate file
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/h264_refs.c')
-rw-r--r-- | libavcodec/h264_refs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 02c7867abc..2b90168ab1 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -725,7 +725,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count) for (j = 0; j < 16; j++) { remove_long(h, j, 0); } - h->frame_num = h->cur_pic_ptr->frame_num = 0; + h->poc.frame_num = h->cur_pic_ptr->frame_num = 0; h->mmco_reset = 1; h->cur_pic_ptr->mmco_reset = 1; for (j = 0; j < MAX_DELAYED_PIC_COUNT; j++) |