summaryrefslogtreecommitdiff
path: root/libavformat/isom.h
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-25
| |
* | Fix ff_mov_write_chan() so it can be used by other muxers.Carl Eugen Hoyos2011-05-17
| |
* | Initial caf muxer.Carl Eugen Hoyos2011-05-15
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (33 commits) rtpdec_qdm2: Don't try to parse data packet if no configuration is received ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand. ac3enc: clean up count_frame_bits() and count_frame_bits_fixed() mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame. srtdec: make sure we don't write past the end of buffer wmaenc: improve channel count and bitrate error handling in encode_init() matroskaenc: make sure we don't produce invalid file with no codec ID matroskadec: check that pointers were initialized before accessing them lavf: fix function name in compute_pkt_fields2 av_dlog message lavf: fix av_find_best_stream when providing a wanted stream. lavf: fix av_find_best_stream when decoder_ret is given and using a related stream. ffmpeg: factorize quality calculation tiff: add support for SamplesPerPixel tag in tiff_decode_tag() tiff: Prefer enum TiffCompr over int for TiffContext.compr. mov: Support edit list atom version 1. configure: Enable libpostproc automatically if GPL code is enabled. Cosmetics: fix prototypes in oggdec oggdec: fix memleak with continuous streams. matroskaenc: add missing new line in av_log() call dnxhdenc: add AVClass in private context. ... swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code. Above code is also just in case its not obvios to a large extended duplicates that where cherry picked from ffmpeg. Conflicts: configure ffmpeg.c libavformat/matroskaenc.c libavutil/pixfmt.h libswscale/ppc/swscale_template.c libswscale/swscale.c libswscale/swscale_template.c libswscale/utils.c libswscale/x86/swscale_template.c tests/fate/h264.mak tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_copy_le tests/ref/lavfi/pixfmts_null_le tests/ref/lavfi/pixfmts_scale_le tests/ref/lavfi/pixfmts_vflip_le Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Support edit list atom version 1.Yusuke Nakamura2011-05-12
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Move channel chunk reading function to isom.c.Carl Eugen Hoyos2011-04-28
| | | | | | | | Move ff_read_chan_chunk() to isom.c and rename it as ff_mov_read_chan().
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. make av_dup_packet() more cautious on allocation failures make containers pass palette change in AVPacket introduce side information for AVPacket Politic commits that have not been pulled: Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * make containers pass palette change in AVPacketKostya Shishkov2011-04-15
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
|/ | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* In ts demuxer, support aac flexmux using extradata in iods, issue #2346Baptiste Coudurier2010-11-23
| | | | Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk
* movdec: Split out ff_mov_read_stsdMartin Storsjö2010-10-05
| | | | Originally committed as revision 25359 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move AVCodecTag from riff.h into internal.h.Francesco Lavra2010-05-22
| | | | | | Patch by Francesco Lavra, francescolavra interfree it Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mov: Read QuickTime chaptersDavid Conrad2010-04-21
| | | | Originally committed as revision 22928 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Always consider the mov language code as 4 bytes fixed size and change theReimar Döffinger2010-01-30
| | | | | | function declaration to reflect this. Originally committed as revision 21558 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove no more needed MOVAtom.offset fieldBaptiste Coudurier2010-01-04
| | | | Originally committed as revision 21023 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Search relative path according to alias record when opening mov reference files.Baptiste Coudurier2009-11-15
| | | | | | Based on patch by Maksym Veremeyenko, verem at m1stereo dot tv Originally committed as revision 20539 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make mov LPCM and AAC parsing functions publicPeter Ross2009-09-16
| | | | Originally committed as revision 19878 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove time_rate, we cannot compute exactly when fragments areBaptiste Coudurier2009-06-11
| | | | | | | used and we cannot determine if fragments are present or not in streamed mode. Originally committed as revision 19148 to svn://svn.ffmpeg.org/ffmpeg/trunk
* parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gopBaptiste Coudurier2009-05-13
| | | | Originally committed as revision 18813 to svn://svn.ffmpeg.org/ffmpeg/trunk
* align and update doxygenBaptiste Coudurier2009-05-13
| | | | Originally committed as revision 18812 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Parse 'cslg' atom to retrieve dts shift when 'ctts' duration is negative.Baptiste Coudurier2009-05-13
| | | | | | | We have now dts <= pts, note that for some B frames dts+1 == pts can happen if a crappy timebase is used instead of correct /1001. Originally committed as revision 18810 to svn://svn.ffmpeg.org/ffmpeg/trunk
* allocate palette in codec directlyBaptiste Coudurier2009-03-15
| | | | Originally committed as revision 17976 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move MOVContext and related structures from mov.c to isom.h. See "[PATCH]Ronald S. Bultje2009-03-09
| | | | | | move MOVContext from mov.c to isom.h" thread on ML. Originally committed as revision 17915 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 'code' is used to index a table so make it unsignedAurelien Jacobs2009-01-21
| | | | | | this prevents using negative index and possibly crashing with broken files Originally committed as revision 16714 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-19
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove _t in typedef for POSIX compatibilityBaptiste Coudurier2008-12-11
| | | | Originally committed as revision 16063 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-31
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Set correct codec type and id for text subtitles.Michael Niedermayer2008-01-26
| | | | | | | fixes http://samples.mplayerhq.hu/mov/subtitles-embedded/subtitlemovie.mov closes issue341 Originally committed as revision 11624 to svn://svn.ffmpeg.org/ffmpeg/trunk
* include all prerequisites in header filesMåns Rullgård2007-06-16
| | | | Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmectics, use consistant and homogeneous type names for atomsBaptiste Coudurier2007-04-26
| | | | Originally committed as revision 8828 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmectics, mov -> mp4Baptiste Coudurier2007-03-24
| | | | Originally committed as revision 8497 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use common tables for mov muxer and demuxerBaptiste Coudurier2007-03-03
| | | | Originally committed as revision 8205 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add codec_id <-> codec_tag tables to AVIn/OutputFormatMichael Niedermayer2007-01-21
| | | | Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-07
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add official LGPL license headers to the files that were missing them.Diego Biurrun2006-09-10
| | | | Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move common code from mov.c and movenc.c to isom.cBaptiste Coudurier2006-08-01
Originally committed as revision 5882 to svn://svn.ffmpeg.org/ffmpeg/trunk