1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavformat
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-25 17:14:32 +01:00
2014-01-16 00:38:27 +01:00
2014-02-28 00:07:31 +01:00
2014-04-02 09:49:30 +02:00
2013-12-25 17:38:29 +01:00
2014-04-01 01:13:09 +02:00
2014-03-31 23:47:29 +02:00
2013-12-23 16:28:44 +01:00
2014-03-11 13:22:49 +01:00
2014-03-22 01:26:48 +01:00
2013-12-25 17:38:29 +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-02-09 14:29:07 +00:00
2014-04-04 00:28:28 +02:00
2013-12-25 17:38:29 +01:00
2013-12-25 17:38:30 +01:00
2014-03-04 22:54:13 +01:00
2014-03-08 12:36:57 +01:00
2014-04-02 09:49:30 +02:00