summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avcodec/movenc: move chapter_properties under the #if of the code that uses itMichael Niedermayer2013-08-24
| | | | | | Fixes warning about unused variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/redspark: check coef_offMichael Niedermayer2013-08-23
| | | | | | | | Fixes out of array reads Found-by: Laurent Butti <laurentb@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: Make tkhd "enabled" flag QuickTime compatible Conflicts: libavformat/movenc.c tests/ref/acodec/alac tests/ref/acodec/pcm-s16be tests/ref/acodec/pcm-s24be tests/ref/acodec/pcm-s32be tests/ref/acodec/pcm-s8 tests/ref/lavf/mov tests/ref/vsynth/vsynth1-dnxhd-1080i tests/ref/vsynth/vsynth1-mpeg4 tests/ref/vsynth/vsynth1-prores tests/ref/vsynth/vsynth1-qtrle tests/ref/vsynth/vsynth1-svq1 tests/ref/vsynth/vsynth2-dnxhd-1080i tests/ref/vsynth/vsynth2-mpeg4 tests/ref/vsynth/vsynth2-prores tests/ref/vsynth/vsynth2-qtrle tests/ref/vsynth/vsynth2-svq1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Make tkhd "enabled" flag QuickTime compatibleJohn Stebbins2013-08-23
| | | | | | | | | | | | | | | | QuickTime will play multiple audio tracks concurrently if this flag is set for multiple audio tracks. And if no subtitle track has this flag set, QuickTime will show no subtitles in the subtitle menu. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7'Michael Niedermayer2013-08-23
|\| | | | | | | | | | | | | * commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7': mov: use tkhd enabled flag to set the default track Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: use tkhd enabled flag to set the default trackJohn Stebbins2013-08-23
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavf/tee: copy metadata to output chained muxersStefano Sabatini2013-08-23
| |
* | avformat/movenc: use av_freep() instead of av_free() except for local ↵Michael Niedermayer2013-08-23
| | | | | | | | | | | | variables before return Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/image2: extend start_number range to accept zeroStefano Sabatini2013-08-22
| | | | | | | | Address trac ticket #2884.
* | Merge commit '60198742ff851f11a3757c713fc75a9c19b88566'Michael Niedermayer2013-08-22
|\| | | | | | | | | | | | | | | | | | | * commit '60198742ff851f11a3757c713fc75a9c19b88566': movenc: fix detection of 64bit offset requirement Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: fix detection of 64bit offset requirementClément Bœsch2013-08-21
| | | | | | | | | | | | The old method doesn't work when moov is relocated to beginning of file Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'Michael Niedermayer2013-08-22
|\| | | | | | | | | | | | | * commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e': movenc: Make chapter track QuickTime compatible Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Make chapter track QuickTime compatibleJohn Stebbins2013-08-21
| | | | | | | | | | | | QuickTime requires that the stsd.text box be completely filled in. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'Michael Niedermayer2013-08-22
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b': movenc: add faststart option for web streaming Conflicts: doc/muxers.texi libavformat/movenc.c libavformat/movenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: add faststart option for web streamingClément Bœsch2013-08-21
| | | | | | | | | | | | | | Faststart moves the moov atom to the beginning of the file and rewrites the rest of the file after muxing is complete. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/tee: initialize ret in parse_bsfs()Stefano Sabatini2013-08-22
| | | | | | | | Fix spurious failures.
* | lavf/tee: add special select optionStefano Sabatini2013-08-21
| |
* | Merge commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb'Michael Niedermayer2013-08-21
|\| | | | | | | | | | | | | | | | | | | * commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb': movenc: Allow chapters to be written in trailer Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Allow chapters to be written in trailerJohn Stebbins2013-08-20
| | | | | | | | | | | | | | | | This allows creation of frame accurate chapter marks from sources like DVD and BD where the precise chapter location is not known until the chapter mark has been reached during reading. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'Michael Niedermayer2013-08-21
|\| | | | | | | | | | | | | * commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8': movenc: Allow chapter track in default MODE_MP4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Allow chapter track in default MODE_MP4John Stebbins2013-08-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '64af59bc4916fac5578b31c89da13c30b591bddf'Michael Niedermayer2013-08-21
|\| | | | | | | | | | | | | * commit '64af59bc4916fac5578b31c89da13c30b591bddf': avformat: Fix references to removed av_close_input_file in Doxygen Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Fix references to removed av_close_input_file in DoxygenDiego Biurrun2013-08-20
| |
* | avformat/unix: reshuffle #includesMichael Niedermayer2013-08-21
| | | | | | | | | | | | This should fix openbsd while hopefully also working on solaris & android Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/unix: include sys/socket.hMichael Niedermayer2013-08-21
| | | | | | | | | | | | unbreak android ndk r8 build Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: ilbc needs audio_vbr set.Michael Niedermayer2013-08-20
| | | | | | | | | | | | | | | | Without this the block_align or bitrate value is not available to the decoder Fixes Ticket2858 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | | | | | | | * qatar/master: mov: Prevent segfaults on mov_write_hdlr_tag Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Prevent segfaults on mov_write_hdlr_tagLuca Barbato2013-08-20
| | | | | | | | | | Do not segfault when writing tracks such as tmcd by writing them down as generic DataHandlers if not known.
* | Merge commit '22de0f8369f1f3edf1a55e1d275f3c07c617b53e'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | * commit '22de0f8369f1f3edf1a55e1d275f3c07c617b53e': mov: Compute max duration among the tracks with a timescale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Compute max duration among the tracks with a timescaleLuca Barbato2013-08-20
| | | | | | | | Prevent an assert.
* | Merge commit '39523030108815242178ac5e209c83070bd1baef'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | | | | | | | * commit '39523030108815242178ac5e209c83070bd1baef': mov: Set the timescale for data streams Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Set the timescale for data streamsLuca Barbato2013-08-20
| | | | | | | | Data streams have a defined timebase, do not ignore it.
* | Merge commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4': mkv: Allow flushing the current cluster in progress Conflicts: libavformat/matroskaenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Allow flushing the current cluster in progressMartin Storsjö2013-08-19
| | | | | | | | | | | | | | | | Allow emitting the current cluster that is being written before starting a new one, simplifying how to figure out where clusters are positioned in the output stream (for live streaming). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '59f595921eb2b848a80a74aa81b6bb43038c9ebe'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | * commit '59f595921eb2b848a80a74aa81b6bb43038c9ebe': mkv: Flush the old cluster before writing a new one Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Flush the old cluster before writing a new oneLuca Barbato2013-08-19
| | | | | | | | | | | | | | This simplifies keeping track of cluster boundaries for e.g. livestreaming of WebM. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '98308bd44face14ea3142b501d16226eec23b75a'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | | | | | | | * commit '98308bd44face14ea3142b501d16226eec23b75a': mkv: Add options for specifying cluster limits Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Add options for specifying cluster limitsLuca Barbato2013-08-19
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | | | | | | | * commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a': mkv: Refactor mkv_write_packet Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Refactor mkv_write_packetLuca Barbato2013-08-19
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * ogg: Fix potential infinite discard loopReimar Döffinger2013-08-19
| | | | | | | | | | | | | | | | | | | | | | | | Seeking in certain broken files would cause ogg_read_timestamp to fail because ogg_packet would go into a state where all packets of stream 1 would be discarded until the end of the stream. Bug-Id: 553 CC: libav-stable@libav.org Signed-off-by: Jan Gerber <j@v2v.cc> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/matroskadec: add WebVTT supportMatthew Heaney2013-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | WebM files now support inband text tracks, as described in the following specification: http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm The Matroska demuxer now detects the presence of WebVTT tracks, synthesizing WebVTT packets (having codec id AV_CODEC_ID_WEBVTT) and pushing them downstream in the normal way. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: remove unneeded wavpack tagPaul B Mahol2013-08-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Fix frame width and height for some targa_y216 samples.Carl Eugen Hoyos2013-08-18
| | | | | | | | Fixes ticket #2864.
* | avformat/mpegts: resync from the smallest packet size onMichael Niedermayer2013-08-18
| | | | | | | | | | | | | | This avoids the loss of a packet in many cases if the packet size was wrong. It also improves detection of packet size changes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts_get_pcr: dont loose a packet when resyncingMichael Niedermayer2013-08-18
| | | | | | | | | | | | This matches how read_packet() works Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: fix pos47_fullMichael Niedermayer2013-08-18
| | | | | | | | | | | | The value was off by a packet Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: print packet size warning only if new size differs from oldMichael Niedermayer2013-08-18
| | | | | | | | | | | | | | No case is known to have triggered this, but its more correct to check that the new size differs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: reanalyze packet size on mismatchesMichael Niedermayer2013-08-18
| | | | | | | | | | | | | | Fixes Ticket1812 Fixes Ticket2838 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-18
|\| | | | | | | | | | | | | * qatar/master: movenc: Indicate that negative timestamps are supported Merged-by: Michael Niedermayer <michaelni@gmx.at>