diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 12:32:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 21:23:32 +0100 |
| commit | 82ec6183bcad7d88e3ce0f9d3c9c6a4ed17b13f8 (patch) | |
| tree | f9ab05f42521941f100b94bd2781c1bcd12b53ff /libavcodec/atrac3.c | |
| parent | 345e2a2b43885611f1d44d975235ba0db63b8de8 (diff) | |
| download | ffmpeg-82ec6183bcad7d88e3ce0f9d3c9c6a4ed17b13f8.tar.gz | |
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
mjpegdec: use the AVFrame API properly.
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 639303867640d1880fad675472bc47e9c95f96c7)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac3.c')
0 files changed, 0 insertions, 0 deletions