diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 20:56:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 20:58:03 +0100 |
| commit | 268d93172460f116d239c2cf815d7b2f495efb2d (patch) | |
| tree | 6648863bf756cd7820d36f61d03d24d7bf7f64af /libavcodec/mjpegdec.c | |
| parent | 92b2404571bcdd294d6ef0e614eee55432e959a7 (diff) | |
| parent | e6f0bb65270be51ea43345a28f8e4b1a728f7d0e (diff) | |
| download | ffmpeg-268d93172460f116d239c2cf815d7b2f495efb2d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ATRAC3+ decoder
Conflicts:
Changelog
configure
libavcodec/atrac3plus.c
libavcodec/atrac3plus.h
libavcodec/atrac3plus_data.h
libavcodec/atrac3plusdec.c
libavcodec/atrac3plusdsp.c
libavcodec/version.h
See: 2e1fb96af36348479e14aa85f445915ea09e70fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
0 files changed, 0 insertions, 0 deletions