diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 12:38:42 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 12:38:42 +0300 |
commit | e8a460672f7e9aec129a7cfa01345857b1565a15 (patch) | |
tree | e1ac45a7358c1502eadc93d9389267e41044eb08 /libavcodec/h264_slice.c | |
parent | 0d5e615c10583af5f346f0bc7420ebc5077a5d47 (diff) | |
parent | 9d33bab583a82cf12286c65258a29c6888e1ff98 (diff) |
Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'
* commit '9d33bab583a82cf12286c65258a29c6888e1ff98':
h264: drop H264Context.ouputed_poc
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r-- | libavcodec/h264_slice.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 3313cc34ec..096bc0d24e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -636,7 +636,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst, } h->prev_frame_num_offset = h->frame_num_offset; h->prev_frame_num = h->frame_num; - h->outputed_poc = h->next_outputed_poc; h->recovery_frame = h1->recovery_frame; |