aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/riff.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE ↵Justin Ruggles2012-04-171-1/+1
| | | | | | | | | | | | | | header This matches the value for the plain WAVEFORMATEX header. Also fixes stream copy to WAVE for non-16-bit raw pcm.
| * ZeroCodec DecoderDerek Buitenhuis2012-03-191-0/+1
| | | | | | | | | | | | | | | | An obscure Japanese lossless video codec, originally intended for use with a remote desktop application. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | libavformat: ff_get_bmp_header: return esize tooMichael Niedermayer2012-05-311-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding fourcc YVYU.Carl Eugen Hoyos2012-05-271-0/+1
| | | | | | | | | | | | Based on work by ami_stuff. Fixes ticket #1352
* | aasc: support "Autodesk 24 bit RLE compressor" (FourCC: aas4)Piotr Bandurski2012-05-161-0/+1
| | | | | | | | | | | | fixes ticket #1310 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add SLDV FourCC for dvvideo.Piotr Bandurski2012-05-151-0/+1
| |
* | Support NTSC forward dvcpro videos (PAL looks incorrect).Carl Eugen Hoyos2012-05-151-0/+1
| |
* | lavc: add a OpenEXR decoderJimmy Christensen2012-04-061-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support FLIC in AVI.Paul B Mahol2012-03-281-0/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ZeroCodec DecoderDerek Buitenhuis2012-03-191-0/+1
| | | | | | | | | | | | | | | | An obscure Japanese lossless video codec, originally intended for use with a remote desktop application. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-061-5/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) cdxl demux: do not create packets with uninitialized data at EOF. Replace computations of remaining bits with calls to get_bits_left(). amrnb/amrwb: Remove get_bits usage. cosmetics: reindent avformat: do not require a pixel/sample format if there is no decoder avformat: do not fill-in audio packet duration in compute_pkt_fields() lavf: Use av_get_audio_frame_duration() in get_audio_frame_size() dca_parser: parse the sample rate and frame durations libspeexdec: do not set AVCodecContext.frame_size libopencore-amr: do not set AVCodecContext.frame_size alsdec: do not set AVCodecContext.frame_size siff: do not set AVCodecContext.frame_size amr demuxer: do not set AVCodecContext.frame_size. aiffdec: do not set AVCodecContext.frame_size mov: do not set AVCodecContext.frame_size ape: do not set AVCodecContext.frame_size. rdt: remove workaround for infinite loop with aac avformat: do not require frame_size in avformat_find_stream_info() for CELT avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3 avformat: do not require frame_size in avformat_find_stream_info() for AAC ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/avcodec.h libavcodec/h264.c libavcodec/h264_ps.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riffenc: use av_get_audio_frame_duration()Justin Ruggles2012-03-051-5/+23
| | | | | | | | | | | | For encoding, frame_size is not a reliable indicator of packet duration. Also, we don't want to have to force the demuxer to find frame_size for stream copy to work.
| * riff: fix invalid av_freep() calls on EOF in ff_read_riff_infoJanne Grunau2012-01-221-2/+1
| |
* | riff: IPJ2 decodes with j2k decoder. samples can be made from mencoder and ↵Compn2012-02-221-0/+1
| | | | | | | | jp2avi.dll codec.
* | Add v408 / AYUV encoder and decoder.Carl Eugen Hoyos2012-02-051-0/+2
| | | | | | | | | | | | Fixes last part of ticket #470. Reviewed-by: Paul B Mahol
* | Add "S263" FourCCami_stuff2012-01-191-0/+1
| | | | | | | | | | | | fixes ticket #923 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix ff_get_guid for short reads or errors.Reimar Döffinger2012-01-151-1/+2
| | | | | | | | | | | | | | | | | | Current code would just return uninitialized data with no way to detect this condition. Instead, fill the whole GUID with 0 in that case. Fixes valgrind uninitialized data errors in fate-seek-lavf_asf. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | mpeg12dec: BW10 supportMichael Niedermayer2012-01-141-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: XMPG supportMichael Niedermayer2012-01-141-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "riff: remove references to sonic codec ids"Michael Niedermayer2012-01-131-0/+2
| | | | | | | | | | | | This reverts commit 0fd88d398896353074fee153259dbf3530ca423f. Theres no reason to drop support for this.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-131-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) utils: Check for extradata size overflows. ARM: rv34: fix asm syntax in dc transform functions avio: Fix the value of the deprecated URL_FLAG_NONBLOCK rv34: fix and optimise frame dependency checking rv34: NEON optimised dc only inverse transform avprobe: use avio_size() instead of deprecated AVFormatContext.file_size. ffmenc: remove references to deprecated AVFormatContext.timestamp. lavf: undeprecate read_seek(). avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY. lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I lavc: ifdef out parse_only AVOption nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT mpegvideo_enc: ifdef out/replace references to deprecated codec flags. riff: remove references to sonic codec ids indeo4: add some missing static and const qualifiers rv34: DC-only inverse transform avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields lavfi: move version macros to a new installed header version.h vsrc_buffer: release the buffer on uninit. rgb2rgb: rgb12tobgr12() ... Conflicts: avconv.c doc/APIchanges ffprobe.c libavfilter/Makefile libavfilter/avfilter.h libswscale/rgb2rgb.c libswscale/rgb2rgb.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: remove references to sonic codec idsAnton Khirnov2012-01-121-2/+0
| | | | | | | | They are deprecated and will be purged on next major bump.
| * Detect 'yuv2' as rawvideo also in avi.Carl Eugen Hoyos2012-01-011-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * v410 encoder and decoderDerek Buitenhuis2011-12-131-0/+1
| | | | | | | | | | | | | | | | v410 is a packed 10-bit 4:4:4 YCbCr format used in QuickTime. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | yuv4 libquicktime packed 4:2:0 encoder and decoder.Carl Eugen Hoyos2012-01-041-0/+1
| | | | | | | | | | Reviewed-by: Derek Buitenhuis Reviewed-by: Paul B Mahol
* | v308 Quicktim Uncompressed 4:4:4 encoder and decoder.Carl Eugen Hoyos2012-01-041-0/+1
| | | | | | | | | | Reviewed-by: Derek Buitenhuis Reviewed-by: Paul B Mahol
* | y41p encoder and decoderPaul B Mahol2012-01-021-0/+1
| | | | | | | | | | | | | | | | y41p is a packed 12-bit 4:1:1 YUV format used by Brooktree. Fixes issue 1123 / ticket #102. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avienc: Fix rawvideo 32bitMichael Niedermayer2011-12-171-1/+1
| | | | | | | | | | | | | | Bug found by: Rik Maes <rik.maes54@gmail.com> Change based on suggestion by Rik Maes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: Fix freeing of random value.Michael Niedermayer2011-12-141-2/+1
| | | | | | | | | | Fixes Ticket752 Bug-found-by: Diana Elena Muscalu
* | Detect 'yuv2' as rawvideo also in avi.Carl Eugen Hoyos2011-12-141-0/+1
| |
* | v410 encoder and decoderDerek Buitenhuis2011-12-141-0/+1
| | | | | | | | | | | | | | | | v410 is a packed 10-bit 4:4:4 YCbCr format used in QuickTime. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) Warn about avserver being broken. avconv: drop code for special handling of avserver streams. rawdec: don't set codec timebase. lavf doxy: add muxing stuff to lavf_encoding group lavf doxy: add demuxing stuff to lavf_decoding group lavf doxy: expand/reword metadata API doxy. lavf doxy: add installed headers to groups. lavf doxy: add avio groups into the lavf_io group. lavf doxy: rename lavf I/O group to lavf_io. lavf doxy: add metadata docs to the main lavf group ttadec: check channel count as read from extradata. Add CLJR encoding and decoding regression tests cljr: remove unused code flacdec: Support for tracks in cuesheet metadata block ptx: fix inverted check for sufficient data flac muxer: fix writing of file header and STREAMINFO header from extradata ptx: emit a warning on insufficient picture data utvideo: add fate tests covering all codec variants doc: update to refer to avconv doc: remove some stale entries from the faq ... Conflicts: Changelog avconv.c doc/avconv.texi doc/faq.texi doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/avcodec.h libavcodec/cljr.c libavformat/avformat.h libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Dxtory capture format decoderKostya Shishkov2011-12-101-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avi: add escape130 supportMichael Niedermayer2011-12-101-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cljr: K&R cosmetics cljr: return a more sensible value when encountering invalid headers cljr: drop unnecessary emms_c() calls without MMX code cljr: remove useless casts cljr: group encode/decode parts under single ifdefs cljr: remove stray semicolon cljr: add missing return statement in decode_end() doc: add pulseaudio to the input list avconv: remove unsubstantiated comment shorten: avoid abort() on unknown audio types cljr: add encoder build: merge lists of HTML documentation targets tests/examples: Mark some variables only used within their files as static. tests/tools/examples: Replace direct exit() calls by return. x86 cpuid: set vendor union members separately cljr: release picture at end of decoding rv40: NEON optimised rv40 qpel motion compensation Conflicts: doc/examples/muxing.c libavcodec/cljr.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cljr: add encoderPaul B Mahol2011-12-081-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-281-0/+68
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vc1: use an enum for Frame Coding Mode doc: cleanup filter section indeo3: error out if no motion vector is set. x86inc: Flag shufps as an floating-point instruction for the AVX emulation code. mpegaudio: do not use init_static_data() for initializing tables. musepack: fix signed shift overflow in mpc_read_packet() mov: Make format string match variable type. wmavoice: Make format string match variable type. vc1: select interlaced scan table by FCM element Generalize RIFF INFO tag support; support reading INFO tag in wav pthread: track thread existence in a separate variable. Conflicts: doc/filters.texi libavcodec/pthread.c libavformat/avi.c libavformat/riff.c libavformat/riff.h libavformat/wav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Generalize RIFF INFO tag support; support reading INFO tag in wavVictor Vasiliev2011-11-261-0/+68
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * VBLE DecoderDerek Buitenhuis2011-11-111-0/+1
| | | | | | | | | | | | | | | | | | Add a decoder for the VBLE Lossless Codec, which still has a cult following. Used to be popular several years ago on doom9. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | VBLE DecoderDerek Buitenhuis2011-11-121-0/+1
| | | | | | | | | | | | | | | | | | Add a decoder for the VBLE Lossless Codec, which still has a cult following. Used to be popular several years ago on doom9. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-031-7/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g726: use bits_per_coded_sample instead of bitrate to determine modeJustin Ruggles2011-11-011-7/+10
| | | | | | | | | | | | | | | | | | | | This requires some workarounds in the WAV muxer and demuxer. We need to write the correct bits_per_coded_sample and block_align in the muxer. In the demuxer, we cannot rely on the bits_per_coded_sample value, so we use the bit rate and sample rate to determine the value. This avoids having the decoder rely on AVCodecContext.bit_rate, which is not required to be set by the user for decoding according to our API.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-201-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: presets: rename presets directory lavc: make avcodec_get_context_defaults3 "officially" public lavf: replace av_new_stream->avformat_new_stream part II. lavf,lavd: replace av_new_stream->avformat_new_stream part I. lavf: add avformat_new_stream as a replacement for av_new_stream. Use correct scaling table for bwd-pred MVs in second B-field Ut Video decoder Makefile: change presets extension to .avpreset lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs lavfi: add testsrc source AVOptions: add documentation. presets: update libx264 ffpresets Conflicts: Changelog doc/APIchanges doc/ffmpeg.texi ffpresets/libx264-ipod320.ffpreset ffpresets/libx264-ipod640.ffpreset ffserver.c libavcodec/avcodec.h libavcodec/options.c libavcodec/version.h libavdevice/libdc1394.c libavfilter/avfilter.h libavfilter/vsrc_testsrc.c libavformat/flvdec.c libavformat/riff.c libavformat/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Ut Video decoderKostya Shishkov2011-10-191-0/+4
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | libutvideo: Add Ut Video Decoder WrapperDerek Buitenhuis2011-10-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a wrapper for libutvideo's decoder. This supports decoding the following FOURCCs: ULY0 - 4:2:0 YCbCr ULY2 - 4:2:2 YCbCr ULRG - RGB ULRA - RGBA Also, bump version. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding ASP variant from QNAP Systems.Carl Eugen Hoyos2011-10-161-0/+1
| | | | | | | | Fixes part of ticket #560.
* | Support H264 from QNAP Systems.Carl Eugen Hoyos2011-10-151-0/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-141-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proresdsp: fix function prototypes. prores-idct: fix overflow in c code. fate: update prores-alpha ref after changing pix_fmt to yuv444p10le prores: add missing feature warning for alpha mov: 10l: Terminate string with 0 not '0' mov: Prevent illegal writes when chapter titles are very short. prores: add appropriate -fix_fmt parameter to FATE command riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER Conflicts: libavcodec/avcodec.h libavformat/mov.c tests/fate/prores.mak tests/ref/acodec/g726 tests/ref/fate/prores-alpha Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_headerJohn Brooks2011-10-141-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The cbSize field should be included in all cases, even with PCM where its value is ignored. Fixes encoding PCM audio in Matroska for some players which insist on a full WAVEFORMATEX structure for A_MS/ACM audio. Since fate uses wav files for the audio test a larger number of tests has changed checksums or shifted positions due to the 2 byte longer wave header. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-051-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: qcelpdec: cosmetics: do not add line break before opening bracket in 'for', 'while', 'if/else', and 'switch' statements. qcelp: check output buffer size before decoding qcelpdec: fix the return value of qcelp_decode_frame(). sipr: fix the output data size check and only calculate it once. Synchronize various 4CCs and codec tags from FFmpeg. qdm2: check output buffer size before decoding Fix out of bound reads in the QDM2 decoder. Check for out of bound writes in the QDM2 decoder. ogg/celt: do not set sample_fmt in the demuxer Conflicts: libavcodec/avcodec.h libavcodec/qdm2.c libavformat/oggparsecelt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>