diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-03-31 10:10:42 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-04-29 05:52:57 +0200 |
| commit | 27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3 (patch) | |
| tree | d09e19a8bfe6562cc303834999cdad0507066ed4 /libavcodec | |
| parent | 0ac8ff618c5e6d878c547a8877e714ed728950ce (diff) | |
h264: drop needs_realloc
It is not needed anymore since switching to refcounted frames.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 3 | ||||
| -rw-r--r-- | libavcodec/h264.h | 1 | ||||
| -rw-r--r-- | libavcodec/h264_picture.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264_slice.c | 7 |
4 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ec8ac40913..266b3ec93a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -359,9 +359,6 @@ void ff_h264_free_tables(H264Context *h, int free_rbsp) for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) ff_h264_unref_picture(h, &h->DPB[i]); av_freep(&h->DPB); - } else if (h->DPB) { - for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) - h->DPB[i].needs_realloc = 1; } h->cur_pic_ptr = NULL; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 94fc029ab9..fc2ee4bb09 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -292,7 +292,6 @@ typedef struct H264Picture { int mbaff; ///< 1 -> MBAFF frame 0-> not MBAFF int field_picture; ///< whether or not picture was encoded in separate fields - int needs_realloc; ///< picture needs to be reallocated (eg due to a frame size change) int reference; int recovered; ///< picture at IDR or recovery point + recovery count } H264Picture; diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 694ddb9c8f..0263e6eed4 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -113,7 +113,6 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src) dst->long_ref = src->long_ref; dst->mbaff = src->mbaff; dst->field_picture = src->field_picture; - dst->needs_realloc = src->needs_realloc; dst->reference = src->reference; dst->recovered = src->recovered; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 16d5878fe1..d5c0a6fa29 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -273,8 +273,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; } @@ -289,11 +287,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; } |