OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 12:10:50 +0000 (13:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 12:10:57 +0000 (13:10 +0100)
commit881050d2292809f3b4fae815bbef95c4793b0ab4
tree1cddc0bbdd0c1004e243b4b3528918b28051a870
parent86d9d349cce54984ef7f4b67647ae73bf1c48f88
parentfcf75022d72e2bcda3918e3cef8fc10457cd357a
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>
libavcodec/h264.c