aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/riff.c
Commit message (Collapse)AuthorAgeFilesLines
* lavf/riff: Add 0x729A as TwoCC for G.729.Carl Eugen Hoyos2015-05-251-0/+1
| | | | Reported by forum user muchuan.
* Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce'Michael Niedermayer2015-05-121-1/+1
|\ | | | | | | | | | | | | | | * commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce': riff: Add MultiScope II fourcc MSC2 as MJPEG See: e31cdb5cc8080e164c66838a69f37f60f2d0ea82 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add MultiScope II fourcc MSC2 as MJPEGCarl Eugen Hoyos2015-05-121-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG.Carl Eugen Hoyos2015-05-051-0/+1
| |
* | Merge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3'Michael Niedermayer2015-04-241-0/+1
|\| | | | | | | | | | | | | * commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3': riff: Add GMP4 fourcc for mpeg4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add GMP4 fourcc for mpeg4Vittorio Giovara2015-04-241-0/+1
| |
* | Merge commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82'Michael Niedermayer2015-04-241-0/+1
|\| | | | | | | | | | | | | * commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82': riff: Add GLV4 fourcc for mpeg4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add GLV4 fourcc for mpeg4Vittorio Giovara2015-04-241-0/+1
| |
| * g2meet: Support G2M5 codec variantEric Zimmerman2015-04-191-0/+1
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'Michael Niedermayer2015-04-201-0/+1
|\| | | | | | | | | | | | | | | | | | | | | * commit '22526c1f557a72b3285d295bd8b30c40eb65d437': Canopus HQ/HQA decoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Canopus HQ/HQA decoderVittorio Giovara2015-04-191-0/+1
| | | | | | | | | | | | Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/riff: support G729APaul B Mahol2015-04-171-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d'Michael Niedermayer2015-04-091-0/+1
|\| | | | | | | | | | | | | * commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d': riff: Add 'M705' FourCC for mpeg2video Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add 'M705' FourCC for mpeg2videoVittorio Giovara2015-04-091-0/+1
| |
| * lavf: Do not list mov-only codecs in riff tagsCarl Eugen Hoyos2015-03-171-3/+0
| | | | | | | | | | | | | | Instead check for all mov code-points when demuxing avi and print a warning if a video codec is found like this. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'Michael Niedermayer2015-03-171-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit '02d76141d68e38c80f9a205a56b9af10d74f0995': riff: Add 'tshd' FourCC for H.264 Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add 'tshd' FourCC for H.264Vittorio Giovara2015-03-171-0/+1
| |
* | Merge commit '247e370e2a913db52ca079b347a174c8d393b171'Michael Niedermayer2015-03-131-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '247e370e2a913db52ca079b347a174c8d393b171': TDSC decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * TDSC decoderVittorio Giovara2015-03-131-0/+1
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | lavf: Do not list mov-only codecs in riff.c.Carl Eugen Hoyos2015-03-131-3/+0
| | | | | | | | | | | | Instead check for all mov code-points when demuxing avi and print a warning if a video codec is found like this. Fixes a regression similar to the one described in ticket #4307.
* | Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'Michael Niedermayer2015-02-231-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '35c6ce76b107225a19eb33aea38857d2405882af': Canopus HQX decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Canopus HQX decoderVittorio Giovara2015-02-221-0/+1
| | | | | | | | Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.
* | Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'Michael Niedermayer2015-02-171-0/+1
|\| | | | | | | | | | | | | * commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d': riff: Support QT RLE Animation in avi ('rle ' FourCC) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Support QT RLE Animation in avi ('rle ' FourCC)Vittorio Giovara2015-02-171-0/+1
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'Michael Niedermayer2015-02-171-0/+1
|\| | | | | | | | | | | | | * commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4': riff: Support ProRes in avi (APCH fourcc) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Support ProRes in avi (APCH fourcc)Vittorio Giovara2015-02-171-0/+1
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * riff: Support decoding png in avi (ImageJ)Carl Eugen Hoyos2014-12-081-0/+1
| |
* | Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'Michael Niedermayer2014-11-151-0/+1
|\| | | | | | | | | | | | | * commit '4b39cc1a093c239412ded522c4a899744e7f2008': riff: support ProRes in avi (APCN fourcc) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: support ProRes in avi (APCN fourcc)Vittorio Giovara2014-11-141-0/+1
| |
* | Added support for G2M5 codecEric Zimmerman2014-10-241-0/+1
| | | | | | | | | | | | | | | | 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>
* | avformat/riff: Add UGY2Michael Niedermayer2014-10-191-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding of ImageJ png in avi.Carl Eugen Hoyos2014-09-021-0/+1
| | | | | | | | Fixes ticket #3916.
* | Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'Michael Niedermayer2014-04-231-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * On2 AVC decoderKostya Shishkov2014-04-231-0/+2
| |
| * rawvideo: Support decoding YVYU422 FourCCVittorio Giovara2014-04-081-0/+1
| |
| * On2 VP7 decoderPeter Ross2014-04-041-0/+2
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-041-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * riff: Add an additional AAC TwoCCCarl Eugen Hoyos2014-04-041-0/+1
| | | | | | | | Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
| * riff: support 0xa100 TwoCC for G723_1Piotr Bandurski2014-04-041-0/+1
| | | | | | | | Sample-Id: 4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav
| * riff: add 0x594a TwoCC for Xan DPCMPiotr Bandurski2014-04-041-0/+1
| | | | | | | | Sample-Id: crusader-no-regret.avi
| * riff: add 0x64 to g726Compn2014-04-041-0/+1
| | | | | | | | Sample-Id: g726-test1.wav
| * riff: add G723_1 wav tagPiotr Bandurski2014-04-041-0/+1
| |
| * riff: map 0x0038 to amrnbCompn2014-04-041-0/+1
| | | | | | | | Sample-Id: 40709.avi
| * riff: Support FLIC FourCCPaul B Mahol2014-04-041-0/+1
| |
| * riff: add escape130 FourCCMichael Niedermayer2014-04-041-0/+1
| |
| * riff: support 'aas4' FourCCPiotr Bandurski2014-04-041-0/+1
| |
| * riff: add "YUV8" FourCCPiotr Bandurski2014-04-041-0/+1
| | | | | | | | Sample-Id: MAILTEST.AVI
| * riff: Add "S263" FourCCPiotr Bandurski2014-04-041-0/+1
| |
| * riff: Support XMPG as mpeg1Michael Niedermayer2014-04-041-0/+1
| |
| * riff: support BW10 as mpeg1Michael Niedermayer2014-04-041-0/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 20:46:24 +0000