Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: remove redundant freeing of DPB in h264_decode_end

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 0 insertions, 7 deletions

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 2adee84bf3..529aa59bef 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4946,13 +4946,6 @@ static av_cold int h264_decode_end(AVCodecContext *avctx)
     ff_h264_remove_all_refs(h);
     ff_h264_free_context(h);
 
-    if (h->DPB) {
-        for (i = 0; i < MAX_PICTURE_COUNT; i++) {
-            unref_picture(h, &h->DPB[i]);
-        }
-    }
-    av_freep(&h->DPB);
-
     unref_picture(h, &h->cur_pic);
 
     return 0;