Michael Niedermayer
77ae94727f
Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'
...
* commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d':
riff: Support QT RLE Animation in avi ('rle ' FourCC)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 23:51:39 +01:00
Michael Niedermayer
97bd0e2a93
Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'
...
* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
riff: Support ProRes in avi (APCH fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 23:42:54 +01:00
Vittorio Giovara
195942ed9b
riff: Support QT RLE Animation in avi ('rle ' FourCC)
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-17 12:18:20 -05:00
Vittorio Giovara
c78dc12118
riff: Support ProRes in avi (APCH fourcc)
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-17 12:18:20 -05:00
Carl Eugen Hoyos
250e077ee9
riff: Support decoding png in avi (ImageJ)
2014-12-08 13:29:18 +00:00
Michael Niedermayer
720a8d2b75
Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'
...
* commit '4b39cc1a093c239412ded522c4a899744e7f2008':
riff: support ProRes in avi (APCN fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 01:47:39 +01:00
Vittorio Giovara
4b39cc1a09
riff: support ProRes in avi (APCN fourcc)
2014-11-14 20:24:38 +01:00
Eric Zimmerman
4ba5420e4d
Added support for G2M5 codec
...
This has also been independently found and fixed similarly by carl in
f4a3bbf4a3cd375121ea2495817f3e50e831ed48
The 2nd magic check is taken from carls implementation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24 19:36:09 +02:00
Michael Niedermayer
a71a5c911e
avformat/riff: Add UGY2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 14:38:19 +02:00
Carl Eugen Hoyos
3668168afa
Support decoding of ImageJ png in avi.
...
Fixes ticket #3916 .
2014-09-02 12:02:03 +02:00
Michael Niedermayer
56efd98a65
Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
...
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
On2 AVC decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-23 20:47:13 +02:00
Kostya Shishkov
e2834567d7
On2 AVC decoder
2014-04-23 19:57:44 +02:00
Vittorio Giovara
b6a09ef700
rawvideo: Support decoding YVYU422 FourCC
2014-04-08 23:24:36 +02:00
Peter Ross
ac4b32df71
On2 VP7 decoder
...
Further performance improvements and security fixes by
Vittorio Giovara, Luca Barbato and Diego Biurrun.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-04-04 04:00:11 +02:00
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
Carl Eugen Hoyos
ce58ead40d
riff: Add an additional AAC TwoCC
...
Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
2014-04-04 01:29:29 +02:00
Piotr Bandurski
1e8c4fb8fc
riff: support 0xa100 TwoCC for G723_1
...
Sample-Id: 4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav
2014-04-04 01:29:29 +02:00
Piotr Bandurski
00ccdcd88c
riff: add 0x594a TwoCC for Xan DPCM
...
Sample-Id: crusader-no-regret.avi
2014-04-04 01:29:29 +02:00
Compn
7b600ea0da
riff: add 0x64 to g726
...
Sample-Id: g726-test1.wav
2014-04-04 01:29:28 +02:00
Piotr Bandurski
b7a12ab95b
riff: add G723_1 wav tag
2014-04-04 01:29:28 +02:00
Compn
10a14bd574
riff: map 0x0038 to amrnb
...
Sample-Id: 40709.avi
2014-04-04 01:29:28 +02:00
Paul B Mahol
228af18a98
riff: Support FLIC FourCC
2014-04-04 01:29:28 +02:00
Michael Niedermayer
fb6c21fa8c
riff: add escape130 FourCC
2014-04-04 01:29:27 +02:00
Piotr Bandurski
ae58466994
riff: support 'aas4' FourCC
2014-04-04 01:29:27 +02:00
Piotr Bandurski
7100f3c07d
riff: add "YUV8" FourCC
...
Sample-Id: MAILTEST.AVI
2014-04-04 01:29:27 +02:00
Piotr Bandurski
c9787f034c
riff: Add "S263" FourCC
2014-04-04 01:29:27 +02:00
Michael Niedermayer
9ff6429b07
riff: Support XMPG as mpeg1
2014-04-04 01:29:26 +02:00
Michael Niedermayer
771cb3e592
riff: support BW10 as mpeg1
2014-04-04 01:29:26 +02:00
Piotr Bandurski
eaec09a575
riff: Add SLDV FourCC for dvvideo
2014-04-04 01:29:25 +02:00
Carl Eugen Hoyos
a1c58b3acd
riff: Support NTSC forward dvcpro videos
...
PAL looks incorrect.
2014-04-04 01:29:25 +02:00
Piotr Bandurski
6aa7cbd58c
riff: add dvis/pdvc FourCCs
2014-04-04 01:29:24 +02:00
Piotr Bandurski
adf0ff0000
riff: add "GXVE" FourCC for WMV2
...
Sample-Id: vivd.avi
2014-04-04 01:29:24 +02:00
Compn
96dd7b2332
riff: add PLV1 fourcc to mpeg4
...
Sample-Id: york-water-meteor.avi
2014-04-04 01:29:24 +02:00
Carl Eugen Hoyos
f5f18aecef
riff: Support decoding ASP variant from QNAP Systems
2014-04-04 01:29:23 +02:00
Piotr Bandurski
ade32b4a84
riff: add "SM4V" FourCC
2014-04-04 01:29:23 +02:00
Compn
684e43c5e3
riff: add DYM4 mpeg4 fourcc
2014-04-04 01:29:23 +02:00
Piotr Bandurski
32b0942c99
riff: add DM4V FourCC
2014-04-04 01:29:23 +02:00
Compn
fa6a021121
riff: add G264 to mpeg4, only decodes keyframes
2014-04-04 01:29:22 +02:00
Piotr Bandurski
9ab2d5a33c
riff: add "lsvm" FourCC for H263.
2014-04-04 01:29:22 +02:00
Carl Eugen Hoyos
915524e541
riff: Support H.264 fourcc UMSV
2014-04-04 01:29:22 +02:00
Carl Eugen Hoyos
dcb6e145eb
riff: add FourCC for GeoVision cameras
2014-04-04 01:29:22 +02:00
Carl Eugen Hoyos
9d9d319a3c
riff: Add V264 for H264 in CCTV recordings
2014-04-04 01:29:21 +02:00
Carl Eugen Hoyos
51ace0fb92
riff: add H264 from QNAP Systems
2014-04-04 01:29:21 +02:00
Piotr Bandurski
a52a1bc912
riff: add SMV2 FourCC for H264
...
Sample-Id: smv2.avi
2014-04-04 01:29:21 +02:00
Clément Bœsch
235bf1dab5
riff: add ISMP/timecode tag
2014-04-04 00:28:28 +02:00
James Almer
fa570a5548
riff: Add ITRK tag
...
Some players, like foobar2000 or modern versions of WMP, create WAV
files using the ITRK tag for track instead of IPRT
2014-04-04 00:28:28 +02:00
Peter Ross
4a031ce3c6
avformat/riff: add On2 VP7 fourccs
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25 13:29:29 +01:00
James Zern
3e0175d89a
riff: add VP9 fourcc
2014-03-09 18:09:39 +01:00
Ben Littler
fb0a988f94
riff: IPJ2 decodes with JPEG2000 decoder
...
Samples can be made from mencoder and jp2avi.dll codec.
2014-03-09 18:09:39 +01:00
Michael Niedermayer
0c4bf87b29
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Mirillis FIC video decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08 19:02:46 +01:00