-
Michael Niedermayer authored
* qatar/master: codec_desc: group image codecs together Conflicts: libavcodec/codec_desc.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
a8a84fa8
* qatar/master:
codec_desc: group image codecs together
Conflicts:
libavcodec/codec_desc.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>