virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
87,600 Commits 37 Branches 400 Tags 467 MiB
00a61f30a0
Commit Graph

73 Commits

Author SHA1 Message Date
Michael Niedermayer
7ec414892d avformat/hls: Fix DoS due to infinite loop 
Fixes: loop.m3u

The default max iteration count of 1000 is arbitrary and ideas for a better solution are welcome

Found-by: Xiaohei and Wangchu from Alibaba Security Team

Previous version reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-08-27 19:19:00 +02:00
Mulvya
40b6e28778 doc: Add muxers/demuxers list option 
Signed-off-by: Mulvya <mulvya@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-11 02:59:32 +01:00
Bela Bodecs
ce5c7260df flv demuxer supports live rtmp inputs but there is no any info about it in the docs. 
Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-26 18:29:00 +01:00
Stefano Sabatini
23f0f1537e doc/demuxers: restore alphabetical order 2016-10-13 19:37:47 +02:00
Moritz Barsnick
99d68d462f doc: fix various typos and grammar errors 
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-11 16:57:46 +02:00
Josh de Kock
4ed6edac76 docs/demuxers: add libopenmpt section 
Signed-off-by: Josh de Kock <josh@itanimul.li>
 2016-07-21 02:47:35 +01:00
Lou Logan
fa0f59d55d doc/demuxers: fix "Quicktme" typo 
Signed-off-by: Lou Logan <lou@lrcd.com>
Found-by: furq
 2016-04-13 10:41:42 -08:00
Michael Niedermayer
689211d572 avformat/concatdec: set safe mode to enabled instead of auto 
This is safer, as a selected demuxer could still mean that it was auto-detected
by a user application

Reviewed-previously-by: Nicolas George <george@nsup.org>
Reviewed-previously-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-03-10 02:54:59 +01:00
Tobias Rapp
ca71e6052e doc/demuxers: add some concat demuxer script examples 
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
 2016-02-03 13:30:48 +01:00
Kieran Kunhya
2d40a09b6e avformat: Remove support for libquvi 
libquvi has not been updated since 2013.
It also has a number of security issues.
 2016-01-24 16:01:04 +00:00
Michael Niedermayer
9a8034b8bc doc/demuxers: Document enable_drefs and use_absolute_path 
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-23 00:12:54 +01:00
Alex Agranovsky
259c71c199 avformat/mpjpeg: utilize MIME boundary value to detect start of new frame 
This code is disabled by default so not to regress endpoints sending invalid MIME, but can be enabled via AVOption 'strict_mime_boundary'

Signed-off-by: Alex Agranovsky <alex@sighthound.com>
 2015-12-02 22:39:27 +01:00
Marton Balint
65406b0bed concatdec: add option for adding segment start time and duration metadata 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-11-25 00:34:29 +01:00
Vesselin Bontchev
e32a99264b Add support for Audible AA files 
https://en.wikipedia.org/wiki/Audible.com#Quality
 2015-08-21 04:24:58 +00:00
Stefano Sabatini
90f5668323 doc/demuxers/mpegts: apply a minor grammar fix to option description 
Consistently use impersonal form.
 2015-08-14 12:08:57 +02:00
Stefano Sabatini
819dc7aa0b doc/demuxers/mpegts: update documentation 
The description is yet crappy, it merely copies the description of the
added and undocumented options and their value range. More descriptive
documentation is welcome.
 2015-08-14 12:08:57 +02:00
Marton Balint
5117b5e9aa concatdec: add support for injecting packet metadata 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
25a6711c25 concatdec: add support for specifying outpoint of files 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
7ff0137a1f concatdec: add support for specifying inpoint of files 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Michael Niedermayer
3331213e2a avformat/concatdec: Enable auto_convert by default 
Users have no means to find out from a failure how to make it work
or is it preferred to check and print a warning for h264 concat without auto_convert ?

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 12:19:47 +02:00
Marton Balint
93cc5ca7ed lavf/img2dec: add option to disable pattern matching 
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-12 13:32:23 +02:00
Carl Eugen Hoyos
7de0fefeb5 lavf/gif: Add an option max_gif_delay to limit the frame duration. 
Allows playback for the sample from ticket #4369 in less than 18 hours.
 2015-03-29 12:31:00 +02:00
Benoit Fouet
155f4dd668 doc: add entry for APNG demuxer where needed. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-25 18:28:32 +01:00
Lou Logan
efaa4a8dbf doc/demuxers: document gif demuxer 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-09-03 10:16:05 -08:00
Nicolas George
50ed6e3ce6 lavf/concatdec: implement automatic conversions. 2014-04-29 13:25:59 +02:00
Reimar Döffinger
8cbf0827e1 Various small spelling fixes. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-22 20:44:31 +02:00
Michael Niedermayer
f683895dee avformat/img2dec: support nanosecond file times 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-12 04:52:01 +02:00
Nicolas George
26dea7731e lavf/concatdec: allow to match streams by id. 
That makes the concat demuxer usable with MPEG-PS streams,
even when the streams in the different parts are detected
in different order.
 2014-03-23 19:15:07 +01:00
Andreas Cadhalpun
9898bd9a82 Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 21:12:40 +01:00
Paul B Mahol
5a47f12390 doc/demuxers: fix image2 examples 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-29 16:36:25 +00:00
Michael Niedermayer
48480da6ad Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: document the asf demuxer

Conflicts:
	doc/demuxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 13:03:09 +02:00
Michael Niedermayer
a13af77f49 Merge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e' 
* commit '21015109ec0fac0f104a5355f272ecb956ba3f4e':
  doc: Document the flv demuxer

Conflicts:
	doc/demuxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 11:55:03 +02:00
Luca Barbato
48f2e53ad0 doc: document the asf demuxer 
And drop a typo from the previous FLV entry.
 2013-08-28 11:02:56 +02:00
Luca Barbato
21015109ec doc: Document the flv demuxer 2013-08-27 14:38:19 +02:00
Bryce W. Harrington
d9c46c3cd9 doc: apply various grammar fixes 
The first sentence of each of the modified man pages are worded a bit
awkwardly. These minor copy-edits should make them clearer.

Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-08-10 10:07:30 +02:00
Marton Balint
a7bb12a307 mpegts: add fix_teletext_pts mpegts demuxer option 
Changes since v1 of the patch:
- enable option by default
- add documentation
- move up PTS override code after PES header parsing, to ensure we use the
  last PCR before the first packet of the teletext PES packet.

The option overrides teletext packet PTS and DTS values with the timestamps
calculated from the PCR of the first program which the teletext stream is part
of and is not discarded.

Using the same teletext PID for multiple programs is possible, therefore we
need some kind of heuristics to know which program PCR we should synchronize
to. Using the first non-discarded PCR pid among the programs of the teletext
stream seemed like a good choice.

The patch does not do PCR interpolation to estimate the PCR of the teltetext
packet, it just uses the last PCR of the program, which may cause a slight
error (0.1 sec) in the teletext packet pts-es.

Based on a patch by Reimar Döffinger.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 02:47:38 +02:00
wm4
c3316ddb83 lavf: add support for libgme 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 18:52:45 +02:00
Andrey Utkin
70fbfd75c3 img2dec: Add ts_from_file option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 11:42:28 +02:00
Clément Bœsch
2a7f885fe1 lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
Derek Buitenhuis
fe64b88950 doc: Consistently use 'frame rate' everywhere 
We used to use 'framerate' or 'frame rate' randomly.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-03-31 18:22:08 -04:00
Nicolas George
de1a71595d lavf/concatdec: support seeking. 2013-03-20 20:59:24 +01:00
Stefano Sabatini
d95143ec82 lavf/segment: add support to ffconcat segment list 2013-03-07 01:44:59 +01:00
Nicolas George
87a954d6f4 lavf/concat: document the use of the files durations. 
Address trac ticket #2319.
 2013-03-06 16:58:38 +01:00
Nicolas George
ea2de3d096 lavf/concatdec: add the "duration" directive. 2013-02-24 13:12:46 +01:00
Vicente Jimenez Aguilar
202b5f6deb doc: Fix some obsolete references to av* tools as ff* tools 
Signed-off-by: Diego Biurrun <diego@biurrun.de>

CC: libav-stable@libav.org
 2013-02-18 13:04:29 +01:00
Nicolas George
b68dd8a161 lavf/concatdec: allow probing. 2013-02-13 14:58:50 +01:00
Nicolas George
db9dc5154d lavf/concatdec: add signature directive. 2013-02-13 14:58:50 +01:00
Nicolas George
6d680d20ad lavf/concatdec: add safe option. 2013-02-13 14:58:50 +01:00
Daniel Verkamp
2acd5fb553 doc/demuxers: quote command line arguments with @code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 04:13:55 +01:00
Stefano Sabatini
bad82243cd doc/demuxers: add docs for rawvideo demuxer 2013-02-09 14:57:10 +01:00