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.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.c')
-rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 00984297c5..bf82500ca2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -629,7 +629,7 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) h->prev_frame_num = -1; h->sei_fpa.frame_packing_arrangement_cancel_flag = -1; - h->outputed_poc = h->next_outputed_poc = INT_MIN; + h->next_outputed_poc = INT_MIN; for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++) h->last_pocs[i] = INT_MIN; @@ -1066,7 +1066,7 @@ void ff_h264_flush_change(H264Context *h) { int i, j; - h->outputed_poc = h->next_outputed_poc = INT_MIN; + h->next_outputed_poc = INT_MIN; h->prev_interlaced_frame = 1; idr(h); |