diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-21 18:12:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-21 18:12:13 +0100 |
| commit | ea5adf7080403ad70a3827830c26319823f49adc (patch) | |
| tree | d36bd774e5da69f9a5ebe51c84282e3c5b4d7cb8 /libavcodec/codec_desc.c | |
| parent | b044e81f069cc97488868c3f2ef393c193644f0c (diff) | |
| parent | 17fecb4a59926fc85d76efd0d0405f1aa84e429b (diff) | |
| download | ffmpeg-ea5adf7080403ad70a3827830c26319823f49adc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flashsv: Drop unused function and struct parameters
pcm: fix decoding of pcm_s16le_planar on big-endian
Conflicts:
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/codec_desc.c')
0 files changed, 0 insertions, 0 deletions