diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 12:32:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 12:42:10 +0100 |
| commit | 639303867640d1880fad675472bc47e9c95f96c7 (patch) | |
| tree | b8f3de370c8d29bc6498b58a250fbdab375f91b4 /libavutil/channel_layout.h | |
| parent | 2fade10cb0c53e6b2a663d8ce0566ba7c61013cf (diff) | |
| parent | e2274aa555f023e4f4e4819bf29b2d7e0adec7d5 (diff) | |
| download | ffmpeg-639303867640d1880fad675472bc47e9c95f96c7.tar.gz | |
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
mjpegdec: use the AVFrame API properly.
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/channel_layout.h')
0 files changed, 0 insertions, 0 deletions