diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 22:03:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 22:03:46 +0200 |
| commit | 50daffead2deba9642f0f7069072871adfb75bea (patch) | |
| tree | 04a440fa9724eedc0fdb0a8a80cdf089f1440f9e /libavcodec/arm/aac.h | |
| parent | f364101144f1181ced8e2753c63731dfcaaec4f5 (diff) | |
| parent | 2deb614272e6faad8802c5341971d08c7272f74d (diff) | |
| download | ffmpeg-50daffead2deba9642f0f7069072871adfb75bea.tar.gz | |
Merge commit '2deb614272e6faad8802c5341971d08c7272f74d'
* commit '2deb614272e6faad8802c5341971d08c7272f74d':
mjpegdec: Properly set the context colorspace info
See: c11043aca7365add6c4c80b7cff80d22dde0eb94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/aac.h')
0 files changed, 0 insertions, 0 deletions