Michael Niedermayer
88909beca3
avcodec/movenc: move chapter_properties under the #if of the code that uses it
...
Fixes warning about unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 23:23:00 +02:00
Michael Niedermayer
aadfadd784
avformat/redspark: check coef_off
...
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>
2013-08-23 20:05:35 +02:00
Michael Niedermayer
800ea20cad
Merge remote-tracking branch 'qatar/master'
...
* 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>
2013-08-23 13:49:24 +02:00
Michael Niedermayer
c6f4a3a708
Merge commit ' 1f70a5ad28'
...
* commit '1f70a5ad28
2013-08-23 13:27:34 +02:00
Stefano Sabatini
0be3be9011
lavf/tee: copy metadata to output chained muxers
2013-08-23 12:27:09 +02:00
John Stebbins
30ce289074
movenc: Make tkhd "enabled" flag QuickTime compatible
...
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>
2013-08-23 09:55:42 +02:00
John Stebbins
1f70a5ad28
mov: use tkhd enabled flag to set the default track
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-23 09:24:22 +02:00
Michael Niedermayer
c443689afb
avformat/movenc: use av_freep() instead of av_free() except for local variables before return
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 00:31:15 +02:00
Stefano Sabatini
7af7b45c38
lavf/image2: extend start_number range to accept zero
...
Address trac ticket #2884 .
2013-08-22 14:26:23 +02:00
Michael Niedermayer
25e4ec6aa1
Merge commit ' 60198742ff'
...
* commit '60198742ff
2013-08-22 14:16:52 +02:00
Michael Niedermayer
606a30c5a1
Merge commit ' fe5d5a8ffc'
...
* commit 'fe5d5a8ffc
2013-08-22 13:58:23 +02:00
Michael Niedermayer
d68adbd666
Merge commit ' f8ef91ff3d'
...
* commit 'f8ef91ff3d
2013-08-22 13:37:16 +02:00
Stefano Sabatini
eadb3ad758
lavf/tee: initialize ret in parse_bsfs()
...
Fix spurious failures.
2013-08-22 09:52:54 +02:00
Stefano Sabatini
5ae3563359
lavf/tee: add special select option
2013-08-21 17:44:35 +02:00
Clément Bœsch
60198742ff
movenc: fix detection of 64bit offset requirement
...
The old method doesn't work when moov is relocated to beginning of file
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-21 14:20:33 +01:00
John Stebbins
fe5d5a8ffc
movenc: Make chapter track QuickTime compatible
...
QuickTime requires that the stsd.text box be completely filled in.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-21 14:20:33 +01:00
Clément Bœsch
f8ef91ff3d
movenc: add faststart option for web streaming
...
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>
2013-08-21 14:20:33 +01:00
Michael Niedermayer
a76390d100
Merge commit ' 6c786765cd'
...
* commit '6c786765cd
2013-08-21 11:00:26 +02:00
Michael Niedermayer
8d63aaed1e
Merge commit ' db03cb37fd'
...
* commit 'db03cb37fd
2013-08-21 10:45:27 +02:00
Michael Niedermayer
9ab8de4b23
Merge commit ' 64af59bc49'
...
* commit '64af59bc49
2013-08-21 10:38:45 +02:00
Michael Niedermayer
be03912a78
avformat/unix: reshuffle #includes
...
This should fix openbsd while hopefully also working on solaris & android
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21 05:51:41 +02:00
Michael Niedermayer
97e165cdae
avformat/unix: include sys/socket.h
...
unbreak android ndk r8 build
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-21 00:25:51 +02:00
John Stebbins
6c786765cd
movenc: Allow chapters to be written in trailer
...
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>
2013-08-20 15:18:42 +01:00
John Stebbins
db03cb37fd
movenc: Allow chapter track in default MODE_MP4
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-20 15:18:42 +01:00
Michael Niedermayer
3d64845600
movenc: ilbc needs audio_vbr set.
...
Without this the block_align or bitrate value is not available to the decoder
Fixes Ticket2858
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-20 14:18:24 +02:00
Diego Biurrun
64af59bc49
avformat: Fix references to removed av_close_input_file in Doxygen
2013-08-20 13:33:47 +02:00
Michael Niedermayer
fb679d5374
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mov: Prevent segfaults on mov_write_hdlr_tag
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-20 12:48:52 +02:00
Michael Niedermayer
eec75e0a1f
Merge commit ' 22de0f8369'
...
* commit '22de0f8369
2013-08-20 12:34:54 +02:00
Michael Niedermayer
4a6f1be170
Merge commit ' 3952303010'
...
* commit '3952303010
2013-08-20 12:16:31 +02:00
Michael Niedermayer
e1acfd3cb0
Merge commit ' b886f5c2f1'
...
* commit 'b886f5c2f1
2013-08-20 11:44:25 +02:00
Michael Niedermayer
d169b56b7b
Merge commit ' 59f595921e'
...
* commit '59f595921e
2013-08-20 11:30:55 +02:00
Michael Niedermayer
ac957bc60c
Merge commit ' 98308bd44f'
...
* commit '98308bd44f
2013-08-20 11:15:11 +02:00
Michael Niedermayer
976de369dd
Merge commit ' 148fbdd1c2'
...
* commit '148fbdd1c2
2013-08-20 11:05:02 +02:00
Luca Barbato
67400f6b62
mov: Prevent segfaults on mov_write_hdlr_tag
...
Do not segfault when writing tracks such as tmcd by writing them down
as generic DataHandlers if not known.
2013-08-20 00:22:58 +02:00
Luca Barbato
22de0f8369
mov: Compute max duration among the tracks with a timescale
...
Prevent an assert.
2013-08-20 00:22:58 +02:00
Luca Barbato
3952303010
mov: Set the timescale for data streams
...
Data streams have a defined timebase, do not ignore it.
2013-08-20 00:22:58 +02:00
Martin Storsjö
b886f5c2f1
mkv: Allow flushing the current cluster in progress
...
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>
2013-08-19 22:47:07 +02:00
Luca Barbato
59f595921e
mkv: Flush the old cluster before writing a new one
...
This simplifies keeping track of cluster boundaries for e.g.
livestreaming of WebM.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-08-19 22:47:06 +02:00
Luca Barbato
98308bd44f
mkv: Add options for specifying cluster limits
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-08-19 22:46:31 +02:00
Matthew Heaney
818ebe930f
avformat/matroskadec: add WebVTT support
...
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>
2013-08-19 22:34:57 +02:00
Luca Barbato
148fbdd1c2
mkv: Refactor mkv_write_packet
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-08-19 17:21:15 +02:00
Paul B Mahol
daede1e3fa
matroskaenc: remove unneeded wavpack tag
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-19 09:41:18 +00:00
Reimar Döffinger
9a27acae9e
ogg: Fix potential infinite discard loop
...
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>
2013-08-19 05:20:39 +02:00
Carl Eugen Hoyos
037af63b33
Fix frame width and height for some targa_y216 samples.
...
Fixes ticket #2864 .
2013-08-18 23:37:27 +02:00
Michael Niedermayer
d73cbc22c5
avformat/mpegts: resync from the smallest packet size on
...
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>
2013-08-18 22:59:04 +02:00
Michael Niedermayer
b4429c259a
mpegts_get_pcr: dont loose a packet when resyncing
...
This matches how read_packet() works
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-18 22:48:19 +02:00
Michael Niedermayer
0f2f65bd58
mpegts: fix pos47_full
...
The value was off by a packet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-18 22:45:39 +02:00
Michael Niedermayer
ee7f2609a0
avformat/mpegts: print packet size warning only if new size differs from old
...
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>
2013-08-18 22:45:39 +02:00
Michael Niedermayer
c666c59ac1
mpegts: reanalyze packet size on mismatches
...
Fixes Ticket1812
Fixes Ticket2838
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-18 16:40:18 +02:00
Michael Niedermayer
45975ab7a1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
movenc: Indicate that negative timestamps are supported
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-18 12:40:22 +02:00
