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)
* commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c':
  mxpegdec: use the AVFrame API properly.

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

Simple merge