Michael Niedermayer
634636eb5a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (31 commits)
riff: Add an additional AAC TwoCC
riff: support 0xa100 TwoCC for G723_1
riff: add 0x594a TwoCC for Xan DPCM
riff: add 0x64 to g726
riff: add G723_1 wav tag
riff: map 0x0038 to amrnb
riff: Support FLIC FourCC
riff: add escape130 FourCC
riff: support 'aas4' FourCC
riff: add "YUV8" FourCC
riff: Add "S263" FourCC
riff: Support XMPG as mpeg1
riff: support BW10 as mpeg1
riff: Add SLDV FourCC for dvvideo
riff: Support NTSC forward dvcpro videos
riff: add dvis/pdvc FourCCs
riff: add "GXVE" FourCC for WMV2
riff: add PLV1 fourcc to mpeg4
riff: Support decoding ASP variant from QNAP Systems
riff: add "SM4V" FourCC
...
Conflicts:
libavformat/riff.c
See: various commits, all the merged changes where in ffmpeg already
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04 02:54:53 +02:00
..
2013-12-22 01:48:33 +01:00
2014-03-16 22:38:05 +01:00
2014-03-01 01:56:25 +01:00
2013-12-25 17:14:32 +01:00
2013-12-25 17:14:32 +01:00
2014-01-24 22:50:06 +01:00
2014-03-28 23:54:51 +01:00
2013-12-25 17:14:32 +01:00
2013-12-25 02:32:40 +01:00
2014-03-11 21:05:34 +01:00
2014-01-29 00:44:59 +01:00
2014-03-11 21:05:34 +01:00
2014-01-29 00:44:59 +01:00
2014-03-02 21:44:44 +01:00
2014-04-03 13:31:13 +02:00
2014-04-02 19:04:58 +02:00
2014-03-04 22:21:58 +01:00
2014-03-30 15:00:03 +02:00
2014-03-26 23:58:48 +01:00
2014-03-26 23:58:48 +01:00
2014-01-17 11:11:08 +01:00
2014-03-11 21:05:34 +01:00
2014-03-12 05:09:28 +01:00
2014-03-16 18:24:30 +01:00
2014-03-23 19:15:07 +01:00
2014-03-11 21:05:34 +01:00
2014-03-11 21:05:34 +01:00
2014-03-11 21:05:34 +01:00
2014-03-11 21:05:34 +01:00
2013-12-25 17:23:55 +01:00
2014-01-05 00:51:38 +01:00
2014-01-31 17:32:32 +01:00
2014-01-24 22:41:06 +01:00
2014-03-12 01:50:41 +01:00
2014-01-16 00:38:27 +01:00
2014-03-11 21:05:34 +01:00
2014-02-28 00:07:31 +01:00
2014-04-02 09:49:30 +02:00
2014-03-09 22:59:46 +01:00
2014-03-11 21:05:34 +01:00
2013-12-21 13:52:10 +01:00
2014-01-31 03:08:49 +01:00
2014-03-10 23:38:01 +01:00
2014-03-10 23:38:01 +01:00
2014-01-28 18:50:58 +01:00
2014-04-03 00:27:53 +02:00
2014-03-11 21:05:34 +01:00
2014-03-23 05:56:35 +01:00
2014-03-03 17:04:57 +01:00
2014-03-15 04:29:19 +01:00
2014-01-24 22:50:06 +01:00
2014-01-24 22:52:33 +01:00
2013-12-25 17:38:29 +01:00
2014-02-03 02:04:38 +01:00
2014-03-11 21:05:34 +01:00
2014-03-29 00:38:51 +01:00
2014-03-28 23:54:51 +01:00
2014-04-01 01:13:09 +02:00
2014-03-28 23:54:51 +01:00
2014-03-31 23:47:29 +02:00
2014-03-27 01:10:28 +01:00
2014-02-11 10:29:02 +01:00
2013-12-18 23:46:37 +01:00
2014-04-04 02:44:56 +02:00
2014-01-22 00:33:38 +01:00
2013-12-23 16:28:44 +01:00
2014-02-14 01:51:17 +01:00
2014-03-11 13:22:49 +01:00
2014-01-14 01:59:23 +01:00
2014-02-28 00:04:29 +01:00
2014-03-11 21:05:34 +01:00
2014-03-30 16:36:47 +02:00
2014-03-11 21:05:34 +01:00
2014-03-09 23:41:02 +01:00
2014-01-17 23:09:52 +01:00
2014-03-03 23:33:47 +01:00
2013-12-26 13:24:43 +01:00
2013-12-26 13:24:43 +01:00
2014-04-02 03:15:19 +02:00
2014-04-02 02:54:09 +02:00
2014-03-23 03:22:20 +01:00
2014-03-24 15:11:08 +01:00
2014-03-22 01:26:48 +01:00
2013-12-26 00:11:49 +01:00
2013-12-25 17:38:29 +01:00
2014-03-24 05:28:07 +01:00
2014-03-22 13:55:01 +01:00
2014-03-30 16:36:22 +02:00
2014-03-30 16:36:22 +02:00
2014-02-01 21:09:14 -08:00
2014-02-22 22:39:49 +01:00
2014-03-11 21:05:34 +01:00
2014-03-19 20:39:05 +01:00
2014-03-19 20:54:35 +01:00
2014-04-04 02:18:32 +02:00
2014-01-07 13:16:55 +01:00
2013-12-20 18:08:58 +01:00
2014-03-17 15:43:55 +01:00
2014-01-04 14:13:31 +01:00
2014-01-10 00:34:15 +01:00
2014-01-24 04:17:15 +01:00
2013-12-25 17:38:29 +01:00
2014-02-24 02:24:21 +01:00
2014-02-05 22:36:42 +01:00
2014-03-25 15:47:55 +01:00
2014-01-06 15:28:24 +01:00
2014-02-05 21:16:36 +01:00
2014-03-05 17:07:28 +01:00
2013-12-30 04:05:27 +01:00
2014-03-11 21:05:34 +01:00
2014-03-12 13:33:14 +01:00
2014-02-04 15:37:05 +01:00
2014-03-28 04:32:05 +01:00
2014-02-10 07:41:21 +01:00
2014-01-11 02:28:17 +01:00
2014-01-04 01:36:06 +01:00
2013-12-20 23:04:51 +01:00
2014-02-09 14:29:07 +00:00
2014-03-30 03:23:13 +02:00
2014-03-24 14:03:55 +01:00
2014-04-04 02:54:53 +02:00
2014-02-12 15:59:15 +01:00
2014-02-12 15:59:15 +01:00
2014-04-04 00:28:28 +02:00
2013-12-25 17:38:29 +01:00
2014-03-11 21:05:34 +01:00
2014-03-11 21:05:34 +01:00
2013-12-25 17:38:30 +01:00
2014-03-07 14:09:35 +01:00
2014-03-07 14:09:35 +01:00
2014-01-21 04:13:57 +01:00
2014-01-23 20:15:21 +01:00
2014-03-12 13:33:14 +01:00
2014-03-12 13:33:14 +01:00
2014-03-04 22:54:13 +01:00
2014-03-12 13:33:14 +01:00
2014-03-12 13:33:14 +01:00
2014-01-05 02:38:57 +01:00
2014-02-26 17:46:45 +00:00
2014-01-07 15:02:31 +01:00
2014-03-03 16:46:22 +01:00
2013-12-20 01:03:19 +01:00
2013-12-29 13:25:13 +01:00
2014-03-11 21:05:34 +01:00
2014-03-11 21:05:34 +01:00
2014-03-11 21:05:34 +01:00
2014-03-08 12:36:57 +01:00
2013-12-19 05:07:22 +01:00
2014-01-07 19:48:13 +01:00
2013-12-25 18:42:26 +01:00
2014-01-23 14:33:56 +01:00
2014-03-22 16:40:46 +01:00
2014-02-11 10:29:02 +01:00
2014-04-03 13:31:13 +02:00
2013-12-25 17:38:30 +01:00
2014-04-02 09:49:30 +02:00
2014-01-01 16:53:54 +01:00
2013-12-29 14:06:47 +01:00
2014-01-07 04:09:19 +01:00
2013-12-25 17:38:30 +01:00
2013-12-23 19:43:09 +01:00
2013-12-23 19:43:09 +01:00
2014-03-30 06:22:50 +02:00
2014-03-30 16:36:47 +02:00
2014-03-11 21:05:34 +01:00
2014-01-17 16:18:40 +01:00