summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
Commit message (Collapse)AuthorAge
* VBLE DecoderDerek Buitenhuis2011-11-12
| | | | | | | | | 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-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-01
| | | | | | | | | | | | | | | | | | | | 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-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-19
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | libutvideo: Add Ut Video Decoder WrapperDerek Buitenhuis2011-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-16
| | | | | | | | Fixes part of ticket #560.
* | Support H264 from QNAP Systems.Carl Eugen Hoyos2011-10-15
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Synchronize various 4CCs and codec tags from FFmpeg.Diego Biurrun2011-10-04
| |
* | riff: map 0x0038 to amrnb, works on http://video.mopoto.com/4/40/407/40709.aviCompn2011-10-02
| |
* | add LJ2K and LJ2C to jpeg2000 decoderCompn2011-09-29
| | | | | | | | works on http://web.archive.org/web/20070128115405/http://www.leadcodecs.com/Download/MJ2K/WhatBox_MJ2k_720x480_PerfectQuality2.avi
* | AMV video encoder.Michael Niedermayer2011-09-25
| | | | | | | | | | | | | | Authors are Vladimir Voroshilov and Dobrica Pavlinušić based on svn blame/log For full details of authorship see http://code.google.com/p/amv-codec-tools/ Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support speex in avi.Carl Eugen Hoyos2011-08-30
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: print the codecs names in the stream mapping. avconv: move the avcodec_find_decoder() call to add_input_streams(). Windows Media Image decoder (WMVP/WVP2) ac3enc: remove outdated TODO comment for apply_channel_coupling() Conflicts: Changelog libavcodec/avcodec.h libavcodec/vc1dec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Windows Media Image decoder (WMVP/WVP2)Alberto Delmás2011-08-23
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | AVCodecTag: Add MKTAG for Go2Meeting video codecThierry Foucu2011-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support FourCC DreX as MPEG4 ASP.Carl Eugen Hoyos2011-08-01
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dnxhddec: avoid a branch in 10-bit decode_dct_block() H.264: Add optimizations to predict x86 assembly. riff: Add mpgv MPEG-2 fourcc add Flash Screen Video 2 decoder Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add mpgv MPEG-2 fourccAlex Converse2011-07-22
| | | | | | | | Supported by mplayer and seen in the wild.
* | Support fourcc YV24.ami_stuff2011-07-06
| | | | | | | | Fixes ticket #306.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Do not include mathematics.h in avutil.hMans Rullgard2011-07-03
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * riff/img2: Add JPEG 2000 codec IDs.Kamil Nowosad2011-06-21
| |
| * riff: Add DAVC fourcc.ami_stuff2011-06-21
| | | | | | | | | | This fourcc is used by the "mpegable AVC" codec and files encoded with this codec decode correctly with our H.264 decoder.
| * riff: Add M263, XVIX, MMJP, CDV5 fourccs.Carl Eugen Hoyos2011-06-21
| |
| * rawvideo: Support auv2 fourcc.ami_stuff2011-06-21
| |
* | Support fourcc Y8 (ticket 308).ami_stuff2011-06-27
| |
* | Support fourcc YV16 (ticket 307).ami_stuff2011-06-27
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: make compute_pkt_fields2() return meaningful error values matroskadec: set timestamps for RealAudio packets. intelh263dec: aspect ratio processing fix. intelh263dec: fix "Strict H.263 compliance" file playback oss,sndio: simplify by using FFMIN. swscale: extract monowhite/black output from yuv2packed[12X]_c(). swscale: de-macro'ify RGB15/16/32 input functions. swscale: rearrange code. movdec: Add support for the 'wfex' atom. ffmpeg.c: Add a necessary const qualifier riff: Fix potential memleak. swscale: change 48bit RGB input macros to inline functions. swscale: change 9/10bit YUV input macros to inline functions. swscale: extract gray16 output functions from yuv2packed[12X](). swscale: use standard clipping functions. swscale: merge macros that are used only once. swscale: fix function declarations in swscale.c. swscale: fix function declaration keywords in x86/swscale_template.c. Conflicts: ffmpeg.c libavcodec/intelh263dec.c libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Fix potential memleak.Alex Converse2011-06-09
| | | | | | | | | | Make ff_get_wav_header() free existing extradata before allocing a new buffer.
* | Add Kamil Nowosads j2k code.Kamil Nowosad2011-05-24
| | | | | | | | This needs work but it should not rot in soc svn.
* | Add "DAVC" FourCCami_stuff2011-05-11
| | | | | | | | | | | | This FourCC is used by "mpegable AVC" codec and the file encoded with this codec decodes correctly with FFmpeg's H264 decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riffenc/ffmpeg: Fix stream copyMichael Niedermayer2011-05-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-04
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: Implement fate-rsync target Make ffmpeg support generic data stream Conflicts: cmdutils.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Make ffmpeg support generic data streamLuca Barbato2011-05-03
| | | | | | | | The patch is the first step to support -dcodec copy
* | Support fourcc MMJP.Carl Eugen Hoyos2011-04-25
| | | | | | | | Fixes ticket #107.
* | Support fourcc XVIX.Carl Eugen Hoyos2011-04-25
| | | | | | | | Fixes ticket #106.
* | Support fourcc M263.Carl Eugen Hoyos2011-04-25
| | | | | | | | Fixes ticket #103.
* | Support fourcc auv2.ami_stuff2011-04-25
| | | | | | | | Fixes ticket #101.
* | Support Canopus SD50 with fourcc "CDV5".Carl Eugen Hoyos2011-04-22
| | | | | | | | Fixes ticket #93.
* | Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'Michael Niedermayer2011-04-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864': avutil: make aes and sha api public handle malloc failures in ff_get_wav_header add xWMA demuxer mpegts: force the default timebase libavcodec: Bump micro after adding the dtx AVOptions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * handle malloc failures in ff_get_wav_headerMax Horn2011-04-14
| | | | | | | | | | | | | | | | | | | | | | ff_get_wav_header is reading data from a WAVE file and then uses it (without validation) to malloc a buffer. It then proceeded to read data into the buffer, without verifying that the allocation succeeded. To address this, change ff_get_wav_header to return an error if allocation failed, and adapted all calling code to handle that error. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avio: add more documentation for AVIOContext. Parse sprite data for WMVP and WVP2, and decode sprites for the latter Replace outdated info on the FAQ Redefine sameq pad: fix example explanation gradfun: add notice from the MPlayer manual eval: add support for trunc, ceil, and floor functions documentation: add setdar and setsar description to filters.texi avio: document some members of AVIOContext. avio: document avio_close(). avio: cosmetics, vertically align comments. avio: cosmetics, group the reading functions. avio: cosmetics, merge all the FF_API_OLD_AVIO blocks. avio: cosmetics, move AVIOContext to start of the file. avio: update file header. os: fix OpenBSD/PowerPC compilation pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE oggdec: fix demuxing chained audio streams fix typo Conflicts: doc/filters.texi libavformat/avio.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Parse sprite data for WMVP and WVP2, and decode sprites for the latterAlberto Delmás2011-04-10
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | riff: add ATRAC3+ guidPeter Ross2011-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_get_wav_header: perform full lookup on WAVEFORMATEXTENSIBLE subformat guidPeter Ross2011-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-27 06:20:55 +0000