OSDN Git Service

Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 12:02:16 +0000 (13:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 20:28:41 +0000 (21:28 +0100)
commitcaf7db0c35e81220431369f0881c831a6deddfac
tree0d352f3dd92087e7e836b79d951271d16b0985c4
parent09965ae7d810e67af17b992a84a90ba4d2787b10
Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'

* commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c':
  mxpegdec: use the AVFrame API properly.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8947f47fdfaf7f3a907a334fc65dc724f2fdd23f)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mxpegdec.c