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.c | |
| parent | 215430e049b78fc4c3d1cb8f6086bcd4bae0375e (diff) | |
| parent | 27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3 (diff) | |
| download | ffmpeg-0d5e615c10583af5f346f0bc7420ebc5077a5d47.tar.gz | |
Merge commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3'
* commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3':
h264: drop needs_realloc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 0f756a2b74..00984297c5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -380,9 +380,6 @@ void ff_h264_free_tables(H264Context *h, int free_rbsp) ff_h264_unref_picture(h, &h->DPB[i]); memset(h->delayed_pic, 0, sizeof(h->delayed_pic)); 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; |