Files
ffmpeg/libavformat
Michael Niedermayer e4eab2d9bd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead

Conflicts:
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-07 12:14:39 +02:00
..
2013-05-10 16:10:52 -03:00
2013-06-09 01:10:36 +02:00
2013-06-09 01:10:36 +02:00
2013-07-30 15:29:12 +02:00
2013-07-01 21:37:16 +00:00
2013-06-28 09:04:16 +02:00
2013-04-15 12:13:41 +02:00
2013-07-31 21:16:54 +02:00
2013-05-29 10:40:13 +00:00
2013-08-02 13:05:16 +02:00
2013-04-20 00:05:35 +02:00
2013-06-29 18:02:37 +02:00
2013-06-20 21:49:02 +02:00
2013-04-18 00:24:25 +02:00
2013-05-24 15:36:54 +02:00
2013-07-02 18:52:45 +02:00
2013-06-15 18:50:11 -03:00
2013-07-07 18:50:03 +02:00
2013-08-02 21:14:59 +02:00
2013-05-23 14:46:01 +02:00
2013-07-06 22:27:35 +02:00
2013-05-01 11:56:34 +02:00
2013-05-01 11:56:34 +02:00
2013-08-05 02:53:16 +02:00
2013-05-18 07:12:56 +02:00
2013-05-10 16:53:50 -03:00
2013-05-26 15:48:50 +02:00
2013-08-05 10:14:42 +02:00
2013-06-06 20:29:38 +02:00
2013-06-16 18:56:56 +00:00
2013-05-29 18:14:43 +00:00
2013-06-02 11:25:56 +02:00