diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 19:36:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 19:36:46 +0100 |
| commit | a8a84fa8b2cdeea11bb6bc0efbd81d5520a02b5e (patch) | |
| tree | 8f5d62aa28d0b5ef3bdd56ae768c521629f08441 /libavformat | |
| parent | 4d10b93bd19674ccc6809e55f3e8940b87484567 (diff) | |
| parent | f20977921be5e28829953da7ba2d899f913ab06b (diff) | |
| download | ffmpeg-a8a84fa8b2cdeea11bb6bc0efbd81d5520a02b5e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
codec_desc: group image codecs together
Conflicts:
libavcodec/codec_desc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions