Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-10 12:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
80978 commits 38 branches 415 tags 287 MiB
Commit graph

19207 commits

Author SHA1 Message Date
James Almer
4acdbb1c6c avformat/oggenc: always use the time base stored in the theora header 
Fixes ticket #5704

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-07-12 11:24:30 -03:00
James Almer
f60b54902f avformat/oggenc: make flac the default for oga muxer 
This allows simpler selection of flac in ogg from the command line,
while following the RFC 5334 recommendation[1] for the oga extension.

[1] https://tools.ietf.org/html/rfc5334#section-10.3

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-07-11 13:08:19 -03:00
Steven Liu
b45a976ed4 add split_by_time flag for support splite mpegts segment at non-keyframe 
support split hls segment at duration set by hls_time

Signed-off-by: LiuQi <liuqi@gosun.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-07-11 12:20:40 +02:00
smitbose
d915b6e592 Added Quadrox format 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-07-05 02:31:35 +02:00
Carl Eugen Hoyos
d5edb6c048 lavf/aiffdec: Support QDMC demuxing. 2016-07-03 04:37:48 +02:00
Michael Niedermayer
c1c7e0abb0 avformat/avformat: Move new field to the end of AVStream 
This fixes part of Ticket5676
This fixes kodi, mpv, chromium and ffplay build against 3.0 and linked to 3.1

This is a similar ABI fix to 1eb43af1a0

Approved-by: BBB
Approved-by: jamrial
Approved-by: BtbN
Approved-by: nevcairiel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-30 17:43:01 +02:00
Hendrik Leppkes
c2e13d2ecd avformat/utils: update deprecated AVStream->codec when the context is updated 
This ensures the AVStream->codec entry is kept in sync when new streams are
discovered mid-playback or changes to the context occur from other sources.

Fixes trac 5678.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-30 17:43:01 +02:00
Vadim Kalinsky
e370aad67d avformat/mov: Skip non-key frames if AVDISCARD_NONKEY is set. 
Github: Closes #222
 2016-06-30 12:00:13 +02:00
Clément Bœsch
ae753dbd0d Merge commit 'b668662939' 
* commit 'b668662939':
  get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes

The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-29 11:35:10 +02:00
Clément Bœsch
9b35242370 Merge commit 'b7f98659f2' 
* commit 'b7f98659f2':
  Remove unnecessary get_bits.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-29 11:16:01 +02:00
Michael Niedermayer
8a3221cc67 avformat/mov: Check sample size 
Fixes integer overflow
Fixes: poc.mp4

Found-by: ajax secure <ajax4sec@hotmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-29 00:30:55 +02:00
Matthieu Bouron
0acc170aad Merge commit '535a742c26' 
* commit '535a742c26':
  build: Change structure of the linker version script templates

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
 2016-06-27 17:56:47 +02:00
Paul B Mahol
d693392886 avformat/mov: parse rtmd track timecode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-06-27 10:27:25 +02:00
Hendrik Leppkes
b20fe650ef Merge commit '4024b566d6' 
* commit '4024b566d6':
  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 '3fdffc032e' 
* commit '3fdffc032e':
  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 '14634429b9' 
* commit '14634429b9':
  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 'e45a638f50' 
* commit 'e45a638f50':
  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 'b84f3a4003' 
* commit 'b84f3a4003':
  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 'f12a705ee5' 
* commit 'f12a705ee5':
  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 '704d2bd18b' 
* commit '704d2bd18b':
  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 'd34826c33d' 
* commit 'd34826c33d':
  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 '72d621069f' 
* commit '72d621069f':
  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 'a79aafd0b4' 
* commit 'a79aafd0b4':
  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 'e1eb0fc960' 
* commit 'e1eb0fc960':
  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 'fd4957d9c6' 
* commit 'fd4957d9c6':
  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 '71852a1ba8' 
* commit '71852a1ba8':
  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 'dbbaad32e3' 
* commit 'dbbaad32e3':
  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 '371df9ba71' 
* commit '371df9ba71':
  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 'db7968bff4' 
* commit 'db7968bff4':
  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 '0c4468dc18' 
* commit '0c4468dc18':
  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 'd621b2f795' 
* commit 'd621b2f795':
  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 '393596f9d5' 
* commit '393596f9d5':
  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 '11de006bab' 
* commit '11de006bab':
  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