summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
Commit message (Collapse)AuthorAge
* 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>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-07
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: fix partial run when no samples path is specified ARM: NEON fixed-point forward MDCT ARM: NEON fixed-point FFT lavf: bump minor version and add an APIChanges entry for avio changes avio: simplify url_open_dyn_buf_internal by using avio_alloc_context() avio: make url_fdopen internal. avio: make url_open_dyn_packet_buf internal. avio: avio_ prefix for url_close_dyn_buf avio: avio_ prefix for url_open_dyn_buf avio: introduce an AVIOContext.seekable field ac3enc: use generic fixed-point mdct lavfi: add fade filter Change yadif to not use out of picture lines. lavc: deprecate AVCodecContext.antialias_algo lavc: mark mb_qmin/mb_qmax for removal on next major bump. Conflicts: doc/filters.texi libavcodec/ac3enc_fixed.h libavcodec/ac3enc_float.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: introduce an AVIOContext.seekable fieldAnton Khirnov2011-04-03
| | | | | | | | Use it instead of url_is_streamed and AVIOContext.is_streamed.
* | Fix issue2246Michael Niedermayer2011-04-03
| | | | | | | | | | ignore last ctts duration Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-04-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: mpegts: propagate avio EOF in read_packet() configure: Initial support for --target-os=symbian Fixed-point FFT and MDCT Include dependencies for test programs ac3enc: simplify sym_quant() flvdec: read index stored in the 'keyframes' tag. mov: Add support for zero-sized stsc runs. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Add support for zero-sized stsc runs.Alex Converse2011-03-31
| | | | | | | | | | | | | | A zero sized stsc run doesn't make a lot of sense but the spec does not prohibit them and MPlayer VLC demuxers support them. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder. Use audio_service_type to set stream disposition. Add APIchanges entry for audio_service_type. Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream. configure: in check_ld, place new -l flags before existing ones support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl doc: update build system documentation aacenc: indentation aacenc: fix the side calculation in search_for_ms vp8.c: rename EDGE_* to VP8_EDGE_*. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavcodec/vp8.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.Justin Ruggles2011-03-25
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-17
|\| | | | | | | | | | | | | | | | | | | Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes senseAnton Khirnov2011-03-16
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_feofAnton Khirnov2011-03-07
| | | | | | | | | | | | AVIOContext.eof_reached should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-07
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-04
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: deprecate get_strz() in favor of avio_get_strAnton Khirnov2011-03-04
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-01
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fseekAnton Khirnov2011-03-01
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-23
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: move init_put_byte() to a new private header and rename itAnton Khirnov2011-02-20
| | | | | | | | | | | | | | init_put_byte should never be used outside of lavf, since sizeof(AVIOContext) isn't part of public ABI. 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>
| * mov: remove stray semicolonMans Rullgard2011-02-10
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * pass QDMC extradata to the decoderSascha Sommer2011-02-06
| | | | | | | | | | | | | | 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>
| * Replace dprintf with av_dlogLuca Barbato2011-01-29
| | | | | | | | dprintf clashes with POSIX.1-2008
| * mov: add support for little-endian utf16 chapter namesJohn Stebbins2011-01-28
| | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
| * In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports itBaptiste Coudurier2011-01-28
| | | | | | | | | | | | In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-26
| | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
| * mov: simplify mov_read_chapters() by using avio_get_str16beAnton Khirnov2011-01-26
| | | | | | | | | | | | It probably also fixes a memleak or two. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"Mans Rullgard2011-01-26
| | | | | | | | | | This reverts commit c34461b35b68ff1f3d04540e0279383c51be8cee. The wrong version of the patch was committed.
| * mov: simplify mov_read_chapters() by using avio_get_str16beAnton Khirnov2011-01-25
| | | | | | | | | | | | It probably also fixes a memleak or two. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* | avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-08
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
* | Revert "lavf: deprecate get_strz() in favor of avio_get_str"Michael Niedermayer2011-03-06
| | | | | | | | | | | | | | | | This API is simply ridiculous. We of course keep API/ABI compatibility only useage of the worse API is reverted. This reverts commit 773947ba76c575abc01ba128206c87440dad40ec.
* | avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-05
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
* | lavf: deprecate get_strz() in favor of avio_get_strAnton Khirnov2011-03-05
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e16ead0716c2f988d1e26369a4c67b354ff86134)
* | lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-03
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc)
* | avio: avio_ prefix for url_fseekAnton Khirnov2011-03-03
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
* | avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-23
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)
* | avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-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> (cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648)
* | avio: move init_put_byte() to a new private header and rename itAnton Khirnov2011-02-20
| | | | | | | | | | | | | | | | init_put_byte should never be used outside of lavf, since sizeof(AVIOContext) isn't part of public ABI. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e731b8d8729e75bfb69f5540e6446d6118dac549)
* | avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* | mov: remove stray semicolonMans Rullgard2011-02-11
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 628b16f45f79aa5eb7514f11026d85e8aa34387f)
* | pass QDMC extradata to the decoderSascha Sommer2011-02-09
| | | | | | | | | | | | | | | | 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> (cherry picked from commit ed19fafd486d6ab0d6e1eba80ceaa482a740c556)
* | Replace dprintf with av_dlogLuca Barbato2011-01-30
| | | | | | | | | | dprintf clashes with POSIX.1-2008 (cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
* | mov: add support for little-endian utf16 chapter namesJohn Stebbins2011-01-28
| | | | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 97b04f5ed3ab3a62e57f0c16841fb8f10d0a174c)
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-28
| | | | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
* | mov: simplify mov_read_chapters() by using avio_get_str16beAnton Khirnov2011-01-28
| | | | | | | | | | | | | | It probably also fixes a memleak or two. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 225b6d7fdea370de3723420e6adc2f3192439b00)
* | Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"Mans Rullgard2011-01-28
| | | | | | | | | | | | This reverts commit c34461b35b68ff1f3d04540e0279383c51be8cee. The wrong version of the patch was committed. (cherry picked from commit c4f8765ac55562fc6ab705e3d17275b69eb5f71d)