diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 11:28:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 11:28:28 +0200 |
| commit | 0d5e615c10583af5f346f0bc7420ebc5077a5d47 (patch) | |
| tree | 673512e8fc02bf2233315b6a26352db6323f6f94 /libavcodec/h264_slice.c | |
| parent | 215430e049b78fc4c3d1cb8f6086bcd4bae0375e (diff) | |
| parent | 27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3 (diff) | |
Merge commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3'
* commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3':
h264: drop needs_realloc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 320845e684..3313cc34ec 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -293,8 +293,6 @@ static inline int pic_is_unused(H264Context *h, H264Picture *pic) { if (!pic->f.buf[0]) return 1; - if (pic->needs_realloc && !(pic->reference & DELAYED_PIC_REF)) - return 1; return 0; } @@ -309,11 +307,6 @@ static int find_unused_picture(H264Context *h) if (i == H264_MAX_PICTURE_COUNT) return AVERROR_INVALIDDATA; - if (h->DPB[i].needs_realloc) { - h->DPB[i].needs_realloc = 0; - ff_h264_unref_picture(h, &h->DPB[i]); - } - return i; } |