Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 12:02:16 +0000 (13:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 12:02:20 +0000 (13:02 +0100)
commit8947f47fdfaf7f3a907a334fc65dc724f2fdd23f
treef5f4d71ee06712e4a9974df0c08523f33792a095
parent37945584bfb29f187e38531c90bb02a32014e48d
parentb605b123ef1d3bac0e7c221d8d7fa74cd8c7253c
Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mxpegdec.c