Permalink
Browse files

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>
  • Loading branch information...
2 parents 86d9d34 + fcf7502 commit 881050d2292809f3b4fae815bbef95c4793b0ab4 @michaelni michaelni committed Mar 21, 2013
Showing with 0 additions and 7 deletions.
  1. +0 −7 libavcodec/h264.c
View
@@ -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;

0 comments on commit 881050d

Please sign in to comment.