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>

diff --cc libavcodec/h264.c
index 2adee84,04ceab5..529aa59
--- 1/libavcodec/h264.c
--- 2/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -4943,16 -4704,8 +4943,9 @@@ static av_cold int h264_decode_end(AVCo
      H264Context *h    = avctx->priv_data;
      int i;
  
 +    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;