summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-12
|\ | | | | | | | | | | | | * qatar/master: riff: Add a mapping for VP6A Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add a mapping for VP6AMartin Storsjö2013-10-12
| | | | | | | | | | | | This allows demuxing VP6A from F4V files. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/riff.c: Fix GeoVision H.264 fourcc.Carl Eugen Hoyos2013-10-11
| | | | | | | | Fixes d24da748
* | Add H.264 fourcc GAVC for GeoVision cameras.Carl Eugen Hoyos2013-10-11
| |
* | riff: g723_1 decodes vivo g723.1 in asfCompn2013-09-15
| | | | | | | | works on bellair_digital_movie.asf
* | avformat/riff: add 0x594a TwoCCPiotr Bandurski2013-09-10
| | | | | | | | | | | | | | | | sample: http://samples.mplayerhq.hu/game-formats/wc4-xan/crusader-no-regret.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: add 0x64 to g726 works on g726-test1.wavCompn2013-09-03
| |
* | avformat/riff: add DM4V FourCCPiotr Bandurski2013-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: add msn audio commentCompn2013-08-13
| |
* | avformat/riff: treat msn audio like gsm_msPiotr Bandurski2013-08-13
| | | | | | | | | | | | Fixes decoding of 4 files from Ticket2854 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead Conflicts: libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND insteadKostya Shishkov2013-08-07
| | | | | | | | | | Voxware is the name of company, it has produced several audio codecs e.g. MetaVoice family and MetaSound.
* | Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b': riff: Move demuxing code to a separate file. Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Move demuxing code to a separate file.Diego Biurrun2013-08-06
| |
* | Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472': riff: Move muxing code to a separate file Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Move muxing code to a separate fileDiego Biurrun2013-08-06
| |
* | lavf/riff: Add ITRK tagJames Almer2013-07-18
| | | | | | | | | | | | | | | | Some players, like foobar2000 or modern versions of WMP, create WAV files using the ITRK tag for track instead of IPRT Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: remove invalid fourcc 'exr 'Paul B Mahol2013-07-04
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'Michael Niedermayer2013-06-16
|\| | | | | | | | | | | | | | | | | | | * commit '508998f7d5cc61c7ac7b049813b47adc24c6e282': avf: move riff tags accessors where they belong Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avf: move riff tags accessors where they belongLuca Barbato2013-06-16
| |
| * riff: Support ULH0 and ULH2 fourccs.Yusuke Nakamura2013-06-10
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | libutvideo: Add ULH0 and ULH2 decoding when using version 13.0.1Stephen Hutchinson2013-06-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'Michael Niedermayer2013-06-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c': Go2Webinar decoder Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Go2Webinar decoderKostya Shishkov2013-06-03
| |
* | Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'Michael Niedermayer2013-04-22
|\| | | | | | | | | | | | | | | | | | | * commit 'b845f5e97b655de0a191f736594777fec9754cf5': riff: Factor out WAVEFORMATEX parsing Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Factor out WAVEFORMATEX parsingLuca Barbato2013-04-21
| | | | | | | | | | | | Makes the code simpler to follow. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * riff: Add ACTRAC3+ guidPeter Ross2013-04-21
| | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'Michael Niedermayer2013-04-22
|\| | | | | | | | | | | | | | | | | | | * commit 'a3bf80a5aea577663354bd538e345b283bcb73de': riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guidPeter Ross2013-04-21
| | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'Michael Niedermayer2013-04-22
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e544782623caf1eb4b2429e9c4f35d6b627accba': riff: Move guid structs and helper functions into riff Conflicts: libavformat/asf.h libavformat/riff.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Move guid structs and helper functions into riffPeter Ross2013-04-21
| | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0'Michael Niedermayer2013-04-22
|\| | | | | | | | | | | | | * commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0': riff: check for eof if chunk size and code are 0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: check for eof if chunk size and code are 0Luca Barbato2013-04-21
| | | | | | | | | | | | | | | | | | | | Prevent an infinite loop. Inspired by a patch from Michael Niedermayer CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'Michael Niedermayer2013-04-22
|\| | | | | | | | | | | | | | | | | | | * commit '1c88617b9421c9af8ae961c05d2381b19c585026': riff: K&R formatting cosmetics Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: K&R formatting cosmeticsLuca Barbato2013-04-21
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | ff_end_tag: assert that the start is aligned.Michael Niedermayer2013-02-08
| | | | | | | | | | | | | | | | If its start is not aligned then aligning its end will likely break many demuxers as they check the size and not the position. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: chunks must be at 2 byte boundaryPaul B Mahol2013-02-08
| | | | | | | | | | | | Fixes #2244. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | riff: fix infinite loopMichael Niedermayer2013-02-05
| | | | | | | | | | | | Fixes Ticket2241 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'Michael Niedermayer2013-01-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '80ac87c13dc8c6c063e26a464c5c542357c0583f': lavc: support ZenoXVID custom tag libcdio: support recent cdio-paranoia float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window theora: Skip zero-sized headers Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: support ZenoXVID custom tagLuca Barbato2013-01-17
| | | | | | | | | | Looks like this kind of samples are produced by certain Russian equipment.
| * Drop Snow codecDiego Biurrun2013-01-06
| | | | | | | | Snow is a toy codec with no real-world use and horrible code.
* | 012v decoder.Carl Eugen Hoyos2013-01-06
| | | | | | | | | | The decoder also supports a12v, but removes the transparency layer since no samples with actual transparency are available for testing.
* | add forgotten AV_ prefix to some CODEC_IDsPaul B Mahol2012-12-09
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Add FourCC V264 for H264 in CCTV recordings.Carl Eugen Hoyos2012-12-02
| |
* | Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'Michael Niedermayer2012-11-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66': lavf: move nuv fourcc audio tags from riff to nuv lavf: add a common function for selecting a pcm codec from parameters Conflicts: libavformat/internal.h libavformat/mov.c libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move nuv fourcc audio tags from riff to nuvJustin Ruggles2012-11-28
| |
| * lavf: add a common function for selecting a pcm codec from parametersJustin Ruggles2012-11-28
| |
* | Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer2012-11-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfe5454cd238b16e7977085f880205229103eccb': lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h lavf: move "MP3 " fourcc from riff to nut fate: vpx: Add dependencies fate: Fix wavpack-matroskamode test dependencies x86: dsputilenc: port to cpuflags Conflicts: libavformat/internal.h libavformat/nut.c tests/fate/vpx.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move "MP3 " fourcc from riff to nutJustin Ruggles2012-11-28
| | | | | | | | Original commit, 7b24f9b, says it was added because it is used in libnut.
* | Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8'Michael Niedermayer2012-11-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8': h264: check ref_count validity for num_ref_idx_active_override_flag h264: add missing new line to log message dcadec: skip QMF on unused channels wavenc: write fact chunk sample count at the correct file position riff: do not add empty metadata tags in INFO chunk Conflicts: libavcodec/dcadec.c libavcodec/h264.c libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>