diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 15:22:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 15:33:46 +0200 |
| commit | 07a79cf8694ac685ae8f579ccc33d113eb46fe3d (patch) | |
| tree | 75920179e81a146478832713c24a5208fde4d81d /libavcodec/h264_slice.c | |
| parent | 4a95cd5d9b4b5a48e438827c9c8f048d86abc14c (diff) | |
| parent | 7a4f74eed51f914e9bbfebaffd4a92ac6791f819 (diff) | |
Merge commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819'
* commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819':
h264: embed the DPB in the context
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 867ff3914e..db6288d842 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -498,9 +498,9 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->droppable = h1->droppable; h->low_delay = h1->low_delay; - for (i = 0; h->DPB && i < H264_MAX_PICTURE_COUNT; i++) { + for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) { ff_h264_unref_picture(h, &h->DPB[i]); - if (h1->DPB && h1->DPB[i].f.buf[0] && + if (h1->DPB[i].f.buf[0] && (ret = ff_h264_ref_picture(h, &h->DPB[i], &h1->DPB[i])) < 0) return ret; } |