1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
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-07-13 16:23:31 +02:00
2013-07-19 17:42:34 +02:00
2013-07-27 20:51:14 +00:00
2013-07-27 20:45:48 +00:00
2013-08-05 10:14:14 +02:00
2013-07-27 12:02:19 +00:00
2013-07-09 16:20:50 +02:00
2013-07-29 20:58:20 +02:00
2013-07-31 20:01:43 +00:00
2013-07-30 21:12:34 +00:00
2013-08-05 15:11:17 +02:00
2013-07-11 16:08:49 +02:00
2013-07-28 22:27:36 +00:00
2013-07-26 14:00:40 +00:00
2013-07-28 22:27:36 +00:00
2013-07-28 22:27:36 +00:00
2013-07-26 18:21:44 +00:00
2013-07-06 05:43:24 +00:00
2013-07-06 05:43:24 +00:00
2013-07-10 12:07:53 +00:00
2013-07-10 12:07:53 +00:00
2013-07-10 12:07:53 +00:00
2013-07-10 12:07:53 +00:00
2013-07-27 12:02:18 +00:00
2013-08-05 10:15:03 +02:00
2013-08-02 16:45:58 +00:00
2013-07-29 14:45:02 +00:00