diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 02:54:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 02:54:53 +0200 |
| commit | 634636eb5aeb970fa4119ca3a259bc7e3a1029f8 (patch) | |
| tree | 4f2f48c6f74127e0027457b34eaa0c08a01b36e2 /tools | |
| parent | 1946ad4d8c089fcdd8aa82b0cd25e52d4443c1b7 (diff) | |
| parent | ce58ead40dd16f272ec1f127f04f69df67c7cd35 (diff) | |
| download | ffmpeg-634636eb5aeb970fa4119ca3a259bc7e3a1029f8.tar.gz | |
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>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions