aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/isom.c
Commit message (Collapse)AuthorAgeFilesLines
* Support Speex in isom.Carl Eugen Hoyos2011-09-071-1/+3
| | | | | Adobe Flash Media Server produces such files although the f4v specification does not allow Speex (nor Nellymoser).
* Support Nellymoser in isom.Carl Eugen Hoyos2011-08-301-0/+2
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-291-5/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Revert "h264: Properly set coded_{width, height} when parsing H.264." isom: add missing AVC-Intra tags, rearrange list and update comments avconv: remove stubs of crop* and pad* options avconv: re-add nb_streams to InputFile. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: add missing AVC-Intra tags, rearrange list and update commentsTomas Härdin2011-08-291-5/+12
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-261-0/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling mpeg12: propagate chunk decode errors and fix conditional indentation vc1: fix VC-1 Pulldown handling. VC1: Fix first/last row checks with slices mp4: Handle non-trivial ES Descriptors. vc1: properly zero coded_block[] edges on new slice entry. Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp4: Handle non-trivial ES Descriptors.Alex Converse2011-08-251-0/+16
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rawdec: Fix decoding of QT WRAW files. configure: report optimization for size separately mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers. mov: Support R10g codec identifier. riff/img2: Add JPEG 2000 codec IDs. riff: Add DAVC fourcc. riff: Add M263, XVIX, MMJP, CDV5 fourccs. rawvideo: Support auv2 fourcc. swscale: Remove unused variable from ff_bfin_get_unscaled_swscale(). h264: Fix assert that failed to compile with -DDEBUG. h264: Add x86 assembly for 10-bit weight/biweight H.264 functions. fate: remove output redirections from old regtest scripts Conflicts: configure libavcodec/rawdec.c libavformat/isom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers.Carl Eugen Hoyos2011-06-211-0/+4
| |
| * mov: Support R10g codec identifier.ami_stuff2011-06-211-0/+1
| |
| * Add xd55 codec tag for XDCAM HD422 720p25 CBR files.Tomas Härdin2011-03-231-0/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Support DTS in mp4/mov.Carl Eugen Hoyos2011-06-171-0/+3
| |
* | Support reading chan atoms with empty channel descriptions.Andrew Wason2011-06-151-4/+6
| | | | | | | | Fixes ticket 263.
* | Fix ff_mov_write_chan() so it can be used by other muxers.Carl Eugen Hoyos2011-05-171-9/+1
| |
* | Initial caf muxer.Carl Eugen Hoyos2011-05-151-0/+29
| |
* | Support Digital Voodoo SD 8 Bit in mov (ticket 195).Carl Eugen Hoyos2011-05-131-0/+1
| |
* | Support R10g in mov.ami_stuff2011-05-131-0/+1
| |
* | Add 5.1 plus stereo-downmix to mov_channel_layout array.Carl Eugen Hoyos2011-05-131-0/+1
| |
* | Clarify warning messages.Carl Eugen Hoyos2011-04-281-2/+2
| |
* | Move channel chunk reading function to isom.c.Carl Eugen Hoyos2011-04-281-0/+60
| | | | | | | | Move ff_read_chan_chunk() to isom.c and rename it as ff_mov_read_chan().
* | Add xd55 codec tag for XDCAM HD422 720p25 CBR files.Tomas Härdin2011-03-211-0/+1
|/
* Add one more avc intra fourcc and extend the descriptionBenjamin Larsson2011-03-101-2/+3
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Add more AVC Intra FOURCCsBenjamin Larsson2011-02-221-2/+4
| | | | | | | Also change the comments a bit since the FOURCCs aren't specific to Flip4Mac and different ones are used for 720 versus 1080 lines. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-211-8/+8
| | | | | | | | | | | | | | 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-3/+3
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* pass QDMC extradata to the decoderSascha Sommer2011-02-061-0/+1
| | | | | | | Makes playing QDMC files in MPlayer work when using the libavformat demuxer. Problem was that the extradata was not passed from demuxer to decoder. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Add ProRes FOURCCs to isom.cTomas Härdin2011-02-031-0/+6
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Add AVC-Intra identifiers used by Flip4Mac for mov filesBenjamin Larsson2011-02-031-0/+2
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Replace dprintf with av_dlogLuca Barbato2011-01-291-4/+4
| | | | dprintf clashes with POSIX.1-2008
* In ts demuxer, support aac flexmux using extradata in iods, issue #2346Baptiste Coudurier2010-11-231-0/+81
| | | | Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk
* xdcam hd422 720p24 fourcc in movBaptiste Coudurier2010-10-041-0/+1
| | | | Originally committed as revision 25336 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correct tag is m2v1Baptiste Coudurier2010-09-301-1/+1
| | | | Originally committed as revision 25271 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove duplicate entriesBaptiste Coudurier2010-09-291-2/+0
| | | | Originally committed as revision 25264 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osxBaptiste Coudurier2010-09-291-0/+2
| | | | Originally committed as revision 25263 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add R10k decoder.Zhou Zongyi2010-09-131-0/+1
| | | | | | | Original patch by Zhou Zongyi, zhouzy A os pku edu cn, resubmitted by James Darnley, james.darnley gmail, changes by me. Originally committed as revision 25115 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support gray16be and rgb48be in movBaptiste Coudurier2010-06-151-0/+2
| | | | Originally committed as revision 23608 to svn://svn.ffmpeg.org/ffmpeg/trunk
* More mov rawvideo fourccBaptiste Coudurier2010-06-041-0/+8
| | | | Originally committed as revision 23480 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move AVCodecTag from riff.h into internal.h.Francesco Lavra2010-05-221-1/+1
| | | | | | Patch by Francesco Lavra, francescolavra interfree it Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Store strings directly in mov_mdhd_language_map instead of using pointers,Reimar Döffinger2010-01-301-13/+13
| | | | | | | which has a up to 200% overhead. Also allows to use memcpy instead of strcpy. Originally committed as revision 21560 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Always consider the mov language code as 4 bytes fixed size and change theReimar Döffinger2010-01-301-2/+3
| | | | | | function declaration to reflect this. Originally committed as revision 21558 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify conversion to 5-bit ASCII.Reimar Döffinger2010-01-301-5/+4
| | | | Originally committed as revision 21557 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support decoding of Avid uncompressed mov files, fixes issue 1685.Carl Eugen Hoyos2010-01-151-0/+1
| | | | Originally committed as revision 21223 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support decoding Avid 1:1x codec, (partially) fixes issue1684.Carl Eugen Hoyos2010-01-151-0/+1
| | | | Originally committed as revision 21222 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add decoder for R210 (uncompressed 10-bit RGB) codec.Reimar Döffinger2009-12-171-0/+1
| | | | Originally committed as revision 20891 to svn://svn.ffmpeg.org/ffmpeg/trunk
* support pcm_f32/64le in movBaptiste Coudurier2009-11-291-0/+2
| | | | Originally committed as revision 20649 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add MP4 object type for ALS.Justin Ruggles2009-11-221-0/+1
| | | | Originally committed as revision 20578 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add yuvs fourcc to raw.c and isom.c, fixes samples/mov/yuvs.movAndrew Wason2009-11-031-0/+1
| | | | | | patch by Andrew Wason Originally committed as revision 20439 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.Carl Eugen Hoyos2009-10-161-1/+1
| | | | Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add '.mp1' for MP1 audio in MOV/CAF.Alexander Strange2009-06-171-0/+1
| | | | | | Tested with streamcopy of 'mp1-sample.mp1' in incoming. Originally committed as revision 19212 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ".mp2" as a fourcc for mp2 audio in MOV. Fixes a problematic MOV file.Jason Garrett-Glaser2009-06-161-0/+2
| | | | Originally committed as revision 19211 to svn://svn.ffmpeg.org/ffmpeg/trunk