aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/riff.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * Synchronize various 4CCs and codec tags from FFmpeg.Diego Biurrun2011-10-041-0/+7
| |
* | riff: map 0x0038 to amrnb, works on http://video.mopoto.com/4/40/407/40709.aviCompn2011-10-021-0/+1
| |
* | add LJ2K and LJ2C to jpeg2000 decoderCompn2011-09-291-0/+2
| | | | | | | | 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-251-0/+1
| | | | | | | | | | | | | | 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-301-0/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-231-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-231-2/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | AVCodecTag: Add MKTAG for Go2Meeting video codecThierry Foucu2011-08-091-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support FourCC DreX as MPEG4 ASP.Carl Eugen Hoyos2011-08-011-0/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-231-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-221-0/+1
| | | | | | | | Supported by mplayer and seen in the wild.
* | Support fourcc YV24.ami_stuff2011-07-061-0/+1
| | | | | | | | Fixes ticket #306.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-041-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-031-0/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * riff/img2: Add JPEG 2000 codec IDs.Kamil Nowosad2011-06-211-0/+1
| |
| * riff: Add DAVC fourcc.ami_stuff2011-06-211-0/+1
| | | | | | | | | | 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-211-0/+4
| |
| * rawvideo: Support auv2 fourcc.ami_stuff2011-06-211-0/+1
| |
* | Support fourcc Y8 (ticket 308).ami_stuff2011-06-271-0/+1
| |
* | Support fourcc YV16 (ticket 307).ami_stuff2011-06-271-0/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-101-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-091-0/+1
| | | | | | | | | | Make ff_get_wav_header() free existing extradata before allocing a new buffer.
* | Add Kamil Nowosads j2k code.Kamil Nowosad2011-05-241-0/+1
| | | | | | | | This needs work but it should not rot in soc svn.
* | Add "DAVC" FourCCami_stuff2011-05-111-0/+1
| | | | | | | | | | | | 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-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-041-0/+1
|\| | | | | | | | | | | | | | | | | | | | | * 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-031-0/+1
| | | | | | | | The patch is the first step to support -dcodec copy
* | Support fourcc MMJP.Carl Eugen Hoyos2011-04-251-0/+1
| | | | | | | | Fixes ticket #107.
* | Support fourcc XVIX.Carl Eugen Hoyos2011-04-251-0/+1
| | | | | | | | Fixes ticket #106.
* | Support fourcc M263.Carl Eugen Hoyos2011-04-251-0/+1
| | | | | | | | Fixes ticket #103.
* | Support fourcc auv2.ami_stuff2011-04-251-0/+1
| | | | | | | | Fixes ticket #101.
* | Support Canopus SD50 with fourcc "CDV5".Carl Eugen Hoyos2011-04-221-0/+1
| | | | | | | | Fixes ticket #93.
* | Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'Michael Niedermayer2011-04-151-1/+5
|\| | | | | | | | | | | | | | | | | | | | | * 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-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | 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-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-101-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | riff: add ATRAC3+ guidPeter Ross2011-04-071-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_get_wav_header: perform full lookup on WAVEFORMATEXTENSIBLE subformat guidPeter Ross2011-04-071-4/+16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, ↵Peter Ross2011-04-071-0/+17
| | | | | | | | | | | | MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.hPeter Ross2011-04-071-0/+6
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes senseAnton Khirnov2011-03-161-2/+2
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Add audio codec 0x1600 (ADTS AAC)Peter Ross2011-03-071-0/+1
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-041-2/+2
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-011-2/+2
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: avio_ prefix for url_fseekAnton Khirnov2011-03-011-2/+2
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* lavf: use a new ffio_wfourcc macro instead of put_tag() where possibleAnton Khirnov2011-02-251-1/+2
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-211-32/+32
| | | | | | | | | | | | In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-211-22/+22
| | | | | | | | | | | | | | In the name of consistency: get_byte -> avio_r8 get_<type> -> avio_r<type> get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-201-6/+6
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>