1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer a8a84fa8b2 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>
2014-03-14 19:36:46 +01:00
..
2014-02-12 13:13:17 +00:00
2014-02-17 20:50:33 +01:00
2014-02-16 21:13:02 +01:00
2014-02-07 19:32:16 +00:00
2014-02-18 18:11:23 +01:00
2014-03-11 09:56:38 +01:00
2014-02-21 16:57:26 -03:00
2014-02-21 16:57:26 -03:00
2014-02-10 21:45:55 +01:00
2014-02-10 21:45:55 +01:00
2014-02-22 18:29:17 +01:00