Hendrik Leppkes
b20fe650ef
Merge commit '4024b566d664a4b161d677554be52f32e7ad4236'
...
* commit '4024b566d664a4b161d677554be52f32e7ad4236':
golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:12:48 +02:00
Hendrik Leppkes
f972653ec1
Merge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b'
...
* commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b':
rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:51:33 +02:00
Hendrik Leppkes
97bdb94341
Merge commit '14634429b915333f3612eaf41db3954222dc4aaf'
...
* commit '14634429b915333f3612eaf41db3954222dc4aaf':
lavf: update muxing doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:32:38 +02:00
Hendrik Leppkes
b23d4e52fd
Merge commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5'
...
* commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5':
dump: Drop unused variable
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:13:36 +02:00
Paul B Mahol
8fb92ea7e2
avcodec: add YUY2 Lossless Codec decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-06-26 10:18:10 +02:00
Jan Sebechlebsky
d46a8e30dc
avformat/tee: Support arbitrary number of slaves
...
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
2016-06-25 23:34:26 +02:00
Rodger Combs
6ee7adb881
lavf/srtdec: fix indent
2016-06-25 15:53:11 -05:00
Rodger Combs
af7e2734b9
lavf: update auto-bsf to new BSF API
2016-06-25 15:50:04 -05:00
Rodger Combs
150e5e13b1
lavf: deprecate av_apply_bitstream_filters
2016-06-25 15:50:03 -05:00
Rodger Combs
1df401505c
lavf/srtdec: fix probing files with negative first timestamps
2016-06-25 15:50:03 -05:00
Michael Niedermayer
4cc896ea5f
avformat/format: Fix registering a format more than once and related races
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-25 20:09:10 +02:00
David Murmann
0296b4b8d8
avformat/movenc: add option to use keys/mdta atoms for metadata
...
Add -movflags use_metadata_tags to the mov muxer. This will cause
the muxer to write all metadata to the file in the keys and mtda
atoms.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-25 14:38:14 +02:00
Clément Bœsch
8ca78d0fef
lavf/utils: fix const warning at a find_decoder() call
2016-06-25 13:38:53 +02:00
Clément Bœsch
1e9b79b2db
movenc: mark astronomical_body const string as static
2016-06-25 10:30:28 +02:00
Michael Niedermayer
46a60fe184
avformat: Fix ff_interleaved_peek()
...
Fixes assertion failures in movenc
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-25 03:04:55 +02:00
Michael Niedermayer
f573acc424
avformat/matroskadec: Call matroska_read_close() on header parsing error
...
Fixes memleak
Fixes Ticket5169
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-24 18:39:53 +02:00
Clément Bœsch
2c45254a77
Merge commit 'b84f3a40034d28828c4ca639d012479a7eaace28'
...
* commit 'b84f3a40034d28828c4ca639d012479a7eaace28':
movenc: Write 'loci' geotag metadata for 3gp and mp4
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-24 11:08:33 +02:00
Clément Bœsch
7a1785014b
Merge commit 'f12a705ee570e16ca692c66b62821a2dbdf82566'
...
* commit 'f12a705ee570e16ca692c66b62821a2dbdf82566':
movenc: Factorize a function for finding a metadata entry and the associated language
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-24 11:01:40 +02:00
Clément Bœsch
9c4af99583
Merge commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd'
...
* commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd':
mov: Print reason of loci parsing failure
See 9e4f0cfc8f
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-24 10:45:57 +02:00
Clément Bœsch
6dd80591b8
Merge commit 'd34826c33d401929b2ff8aee161fd39ad0a73613'
...
* commit 'd34826c33d401929b2ff8aee161fd39ad0a73613':
mov: Add a comment referring to the standard that defines the loci box
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-24 10:44:00 +02:00
Matthieu Bouron
7e4e8fdd34
Merge commit '72d621069fc301b431fac36b5281699a362562f2'
...
* commit '72d621069fc301b431fac36b5281699a362562f2':
movenc: Add a missed const
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-23 22:30:37 +02:00
Matthieu Bouron
c60d328e67
Merge commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9'
...
* commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9':
movenc: Add a test for VFR with b-frames, with a duration change at a fragment end
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-23 22:20:10 +02:00
Matthieu Bouron
b1e1da52fe
Merge commit 'e1eb0fc960163402bbb4e630185790488f7d28ed'
...
* commit 'e1eb0fc960163402bbb4e630185790488f7d28ed':
movenc: Use packets in interleaving queues for the duration at the end of fragments
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-23 22:02:31 +02:00
Michael Niedermayer
388f095766
avformat/g729dec: Fix av_log() formating string
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-23 21:37:05 +02:00
Matthieu Bouron
d671652f6e
Merge commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7'
...
* commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7':
movenc-test: Test write_data_type
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-23 18:03:49 +02:00
Matthieu Bouron
dc62016c4b
Merge commit '71852a1ba89abc8749e309d9d662c49d47e19531'
...
* commit '71852a1ba89abc8749e309d9d662c49d47e19531':
matroskaenc: Provide output bytestream markers
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-23 17:57:34 +02:00
Matthieu Bouron
4e7a921282
Merge commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401'
...
* commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401':
movenc: Provide output bytestream markers for fragmented content
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-23 17:52:14 +02:00
Matthieu Bouron
625eb41086
Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'
...
* commit '371df9ba71393a1c5429d5f40c76348b30e556c7':
flvenc: Provide output bytestream markers
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-23 17:43:19 +02:00
Matthieu Bouron
5d75e46677
Merge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca'
...
* commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca':
avio: Allow custom IO users to get labels for the output bytestream
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-23 15:59:44 +02:00
Clément Bœsch
abb3cc46d5
Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'
...
* commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd':
stereo3d: Add API to get name from value or value from name
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-23 12:38:51 +02:00
Clément Bœsch
5954730ba3
Merge commit 'd621b2f795684f7119057f986066060adbe84220'
...
* commit 'd621b2f795684f7119057f986066060adbe84220':
lavf: Raw G.729 demuxer
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-23 12:26:25 +02:00
David Murmann
c3b0af7456
avformat/mov: add more datatypes in metadata handling
...
Implement variable sized big-endian integers, since these are found
in files created by ARRI cameras.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-23 11:40:32 +02:00
Clément Bœsch
c0ff42bf64
Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'
...
* commit '393596f9d51134d6e45d81ae129223f4faea1232':
mpegtsenc: stop impersonating ses in sdt
This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in 34effe816f
on
Libav side.
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-23 08:17:31 +02:00
Michael Niedermayer
d0b21b28a3
avformat/flacdec: Fix seeking close to EOF
...
Fixes Ticket5428
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 21:10:37 +02:00
Clément Bœsch
a444a50510
Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'
...
* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
Combine deprecation guards where appropriate
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-22 17:36:42 +02:00
Clément Bœsch
48ac4532d4
lavf/img2dec: add pnm pipe demuxers
2016-06-22 15:24:19 +02:00
Michael Niedermayer
99c3c3237b
avformat/utils: Use internal->avctx for bitrate in estimate_timings_from_bit_rate() if needed
...
The internal avctx bitrate is copied into codecpar after estimate_timings()
Fixes Ticket5646
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 14:16:58 +02:00
Michael Niedermayer
4fecb97fd3
avformat/utils: change bit_rate to 64 bit in estimate_timings_from_bit_rate()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 14:16:58 +02:00
Clément Bœsch
5d48e4eafa
Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'
...
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
tests: Move all test programs to a subdirectory
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-22 13:44:34 +02:00
Michael Bradshaw
989a614b70
libavformat/matroskaenc: omit segment UID for webm
...
SegmentUID is not a supported element in WebM. See:
http://www.webmproject.org/docs/container/#SegmentUID
Reviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 12:12:46 +02:00
Clément Bœsch
5558ff3a9f
Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'
...
* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
Split global .gitignore file into per-directory files
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-22 11:28:51 +02:00
Michael Niedermayer
e0faad837c
avformat/flvdec: Do not check last size if it could not be read due to EOF
...
Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 03:02:47 +02:00
Michael Niedermayer
3f380b9b40
avformat/flvdec: Also print sum_flv_tag_size on size mismatches
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 03:02:47 +02:00
Michael Niedermayer
e8931d79cc
avformat/flvdec: Accept last size if its off by 1
...
Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 03:02:47 +02:00
Clément Bœsch
00e122bc0f
Merge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648'
...
* commit 'bc2a32969eb4db17677971def5ad5b936d9d1648':
rtsp: Parse SSRC attributes in the SDP
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:26:44 +02:00
Clément Bœsch
4873952f88
Merge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a'
...
* commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a':
rtpdec: Always check if we have the next packet queued
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:24:30 +02:00
Clément Bœsch
e276f21f99
Merge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92'
...
* commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92':
avio: Remove a leftover comment
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:10:54 +02:00
Clément Bœsch
8df1dbd798
Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5'
...
* commit '5afb94c817abffad030c6b94d7003dca8aace3d5':
Mark read-only tables as static
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:09:35 +02:00
Clément Bœsch
8ef57a0d61
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
...
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 21:55:34 +02:00
Aman Gupta
373b82066c
avformat/mpegts: include stream type for aac
...
this removes the need to probe to discover aac streams
inside mpegts containers, thus speeding up initial playback.
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-21 21:21:30 +02:00