Changeset a8a84fa8 in ffmpeg

Timestamp:

Mar 14, 2014, 6:36:46 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f6122ed3

Parents:

4d10b93 (diff), f2097792 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)