github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-21 05:11:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
67,787 Commits 39 Branches 417 Tags
release/2.4
Commit Graph

5080 Commits

Author SHA1 Message Date
Michael Niedermayer
f391eec032 Update for 2.4.14 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-12-30 23:23:33 +01:00
Michael Niedermayer
7ba100d3e6 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>
(cherry picked from commit 7ec414892d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-08-28 01:41:39 +02:00
Brice Waegeneire
b1b795de84 doc/filters: typo in frei0r 
Signed-off-by: Brice Waegeneire <brice.wge@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6a6eec485d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-08-23 13:15:18 +02:00
Michael Niedermayer
19239c983e Avoid using the term "file" and prefer "url" in some docs and comments 
This should make it less ambigous that these are URLs

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a5f27a9c3a)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-08-23 13:15:16 +02:00
Michael Niedermayer
0a4b2bdb13 doc/developer.texi: Add a code of conduct 
See: [FFmpeg-devel] [Vote] Code of Conduct

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 89e9393022)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-08-23 13:15:16 +02:00
Michael Niedermayer
0edcb9e710 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>
(cherry picked from commit 689211d572)

Conflicts:

	libavformat/concatdec.c
 2017-08-23 13:15:16 +02:00
Paul B Mahol
fcbbe36082 doc/utils: fix typo for min() description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit bdf474bcff)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2016-03-02 16:47:55 -08:00
Michael Niedermayer
3709c43887 Update for 2.4.13 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-01 02:28:54 +01:00
Michael Niedermayer
4f52c0a619 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>
(cherry picked from commit 9a8034b8bc)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-01 02:12:22 +01:00
Michael Niedermayer
9f0e36b101 update for 2.4.12 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-12-06 12:59:30 +01:00
Andrey Utkin
a38a41df39 doc/filters/drawtext: fix centering example 
Signed-off-by: Andrey Utkin <andrey.od.utkin@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
(cherry picked from commit 648b26acc5)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2015-12-01 17:33:22 -08:00
James Almer
30f4512477 doc: mention libavcodec can decode Opus natively 
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit fd9ac48dc8)
 2015-09-20 23:27:16 -03:00
Michael Niedermayer
98f1672022 Update for 2.4.11 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-20 15:06:19 +02:00
Michael Niedermayer
c6f343d7c4 Update for 2.4.10 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 01:12:40 +02:00
Clément Bœsch
07256a7a6e tests: drop bc dependency 
We already have a dependency on awk and bc is sometimes not found in the
base system.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a982c5d74f)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/platform.texi
 2015-05-14 04:08:10 +02:00
Michael Niedermayer
73af011c79 Update for FFmpeg 2.4.9 release 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-25 17:10:18 +02:00
James Almer
3a5b4afd91 doc: add aarch64 cpuflags to fftools documentation 
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 9fc45681e0)
 2015-04-11 16:29:51 -03:00
James Almer
4b817e2fff doc: add missing arm cpuflags to fftools documentation 
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 666ec9bd09)
 2015-04-11 16:29:49 -03:00
James Almer
5598d62a07 doc: add missing x86 cpuflags to fftools documentation 
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 410c93cfd5)
 2015-04-11 16:29:47 -03:00
Michael Niedermayer
2c8c55195d Update for 2.4.8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-30 01:28:28 +02:00
Andreas Cadhalpun
23666f0e22 doc: avoid the incorrect phrase 'allow to' 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 10fd7ff814)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 03:34:22 +02:00
Stefano Sabatini
99de009e97 doc/protocols/tcp: fix units of listen_timeout option value, from microseconds to milliseconds 
s->listen_timeout is passed to ff_listen_bind(), which accepts a timeout
value expressed in milliseconds.

The unit was incorrectly set in 1b4da43ce0.
(cherry picked from commit 6db20926c3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 03:34:22 +02:00
Michael Niedermayer
d66d5d6188 Update for 2.4.7 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-13 21:18:42 +01:00
Michael Niedermayer
05a8114c71 doc/APIchanges: fill in more missing hash values and dates 
all values before 2.5 seem to be filled in now

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8c8ee17e8d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-13 20:48:08 +01:00
Michael Niedermayer
5080ab26d3 doc/APIchanges: fill in and correct some values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0d64982828)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-13 20:48:07 +01:00
Michael Niedermayer
2029acb667 doc/APIchanges: Add av_find_best_pix_fmt_of_2() and av_get_pix_fmt_loss() 
also add deprecation note for avcodec_get_pix_fmt_loss(), avcodec_find_best_pix_fmt_of_2()

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f7a1c5e4d2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-13 20:48:07 +01:00
Michael Niedermayer
0a878d0c94 doc/APIchanges: Fill in some more missing hash values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bbdd940f36)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-13 20:48:07 +01:00
Michael Niedermayer
1fd7fb9036 Update for 2.4.6 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-13 17:14:46 +01:00
Andreas Cadhalpun
9cc1d21e76 doc/examples: fix lib math dep for decoding_encoding 
It uses at least sin().

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f97f2a3527)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-10 05:03:51 +01:00
Michael Niedermayer
5d1d143a4e Update for FFmpeg 2.4.5 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-20 03:03:47 +01:00
Michael Niedermayer
fd72ff6f31 doc/examples/transcoding: check encoder before using it 
Fixes null pointer exception

Found-by: stoupeace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bde27e1e61)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-20 02:25:54 +01:00
Andreas Cadhalpun
883f3e18dd doc: correct license template for t2h.pm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 928322c15f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-01 01:00:09 +01:00
Michael Niedermayer
5c2d8bbffa update for 2.4.4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-30 21:59:47 +01:00
Michael Niedermayer
2abc6e930b doc/APIchanges: Fix some wrong versions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4eae568a07)

Conflicts:

	doc/APIchanges
 2014-11-30 21:40:36 +01:00
Michael Niedermayer
04aa2ffbcf Update for 2.4.3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-01 13:39:52 +01:00
Michael Niedermayer
09256527be Update for 2.4.2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-05 00:53:35 +02:00
Michael Niedermayer
e1ce4f805f update for 2.4.1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-21 23:37:09 +02:00
Michael Niedermayer
c16e80ee3d doc/examples: remove unneeded NULL checks 
dst_file cannot be NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 68bca03951)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 16:53:19 +02:00
Michael Niedermayer
55b1a1e9c1 update for 2.4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 15:37:11 +02:00
Michael Niedermayer
fa1b563196 doc/APIchanges: Update hashes and dates 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 12:45:36 +02:00
Clément Bœsch
b97e27082b doc/APIchanges: attempt to split releases 
Based on several git show origin/release/X.Y:doc/APIchanges.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 12:44:06 +02:00
Andreas Cadhalpun
8f537420ae doc: mention in APIChanges that AVProbeData must be initialized due to the new mime_type field 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 01:13:25 +02:00
Andreas Cadhalpun
d5e802609a doc: document the addition of the AVProbeData.mime_type field and it's implications 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-13 00:36:14 +02:00
James Darnley
e3fb2b0eb7 docs: add example around the suggested commit message format 
It gets rendered inline in HTML and becomes not very clear.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-12 01:59:44 +02:00
Michael Niedermayer
5e3da25618 Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04' 
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-11 01:27:38 +02:00
Diego Biurrun
775a0b04f0 doc: Fix syntax and logical errors in avconv stream combination example 
Bug-Id: 661
CC: libav-stable@libav.org
 2014-09-10 20:30:36 +02:00
Carl Eugen Hoyos
42b4da75b7 Print bits_per_raw_sample for ffprobe -show_streams. 
Fixes ticket #3919.
 2014-09-08 17:49:20 +02:00
Andreas Cadhalpun
a5b20bf4b2 doc/filters.texi: improve the wording of the expr_int_format documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-07 18:29:06 +02:00
Stefano Sabatini
de1f0c94cd doc/muxers/segment: reword text for examples, improve consistency 2014-09-07 13:17:46 +02:00
Stefano Sabatini
4f5493fe23 lavf/segment: add segment_format_options option 2014-09-07 13:17:46 +02:00