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>

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>
a8a84fa8 · Michael Niedermayer · 4d10b93b · f2097792 · a8a84fa8
Commit a8a84fa8 authored Mar 14, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 172 additions and 170 deletions

codec_desc.c libavcodec/codec_desc.c +172 -170

No files found.
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c