virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity
74,937 Commits 37 Branches 400 Tags
Commit Graph

18025 Commits

Author SHA1 Message Date
Andreas Cadhalpun
13d3749424 doc: fix spelling errors 
Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 8d6625642db064a45224cb7a8e037f6e79a6554d)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-10-12 21:46:54 +02:00
Andreas Cadhalpun
173053a125 hls: only seek if there is an offset 
If there is no #EXT-X-BYTERANGE specified, there is no need to seek.
Seeking fails anyway for rtmp, because this protocol does not support
url_seek.

This fixes CNN.m3u from trac ticket 4797 (i.e. Debian bug #798189).

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit f9f0b4c08e7dc2c178ede137af4f64ca84ab2deb)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-10-12 21:46:54 +02:00
Alexandra Hájková
8118fdf8bb asfdec: add more checks for size left in asf packet buffer 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit c0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-10-12 21:46:54 +02:00
Alexandra Hájková
f235f511a0 asfdec: alloc enough space for storing name in asf_read_metadata_obj 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 77cf23668991bfd1fb69339f13e1511b4186b7b3)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-10-12 21:46:54 +02:00
Michael Niedermayer
7ec05ae969 avformat/avidec: Workaround broken initial frame 
Fixes Ticket4851

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3e2ef00394b8079e93835d47c993868229f07502)
 2015-10-09 21:15:15 +02:00
wm4
b9841ba98c avformat/hls: fix some cases of HLS streams which require cookies 
Broken by commit ba12ba859aabfa7153ba397d869db13acdaba340. This only
happens with HLS streams which use encryption and require preserving
cookies sent by the server.

Fixes trac issue #4846.
(cherry picked from commit 26eb2940079d0ec433cf9b2deae24560707cbcf8)
 2015-10-09 21:14:23 +02:00
Przemysław Sobala
635831c087 lavf/img2dec: Fix memory leak 
Fixes #4886

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 01dd7e025c246d9001f1a30f4a5d8fa2936d1a5e)
 2015-10-09 21:13:49 +02:00
Clément Bœsch
ee1bcd3436 avformat/srtdec: make sure we probe a number 
Fixes regression since 7218352e0228028dfa009a3799ec93fd041065f1: WebVTT
files were matching the SRT probing.

(cherry picked from commit 40d9d6de90c3652f4c468ab14976c7faf5e40c07)
 2015-10-09 10:56:31 +02:00
wm4
eca7b0dcce avformat/vobsub: compare correct packet stream IDs 
The stream ID is essentially an arbitrary number defined by the .idx
file headers. They have to match the IDs in the .sub stream. The vobsub
demuxer assumed the IDs would just start from 0, increassing by 1 for
each stream. This is not correct. In the sample I had, the IDs were
starting from 1, leading to no subtitles being displayed at all.

Fix this by using the correct stream ID.

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-08 15:21:45 +02:00
Clément Bœsch
64b659673a avformat/srtdec: more lenient first line probing 
Fixes Ticket #4898
(cherry picked from commit 7218352e0228028dfa009a3799ec93fd041065f1)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-08 15:21:39 +02:00
Clément Bœsch
1d9d300d65 avformat/srtdec: fix number check for the first character 
(cherry picked from commit d161a2a72b083c51ec8fad33a29283703f5fd0cc)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-08 15:21:24 +02:00
Andrey Utkin
6dcd2ebd34 avformat/httpauth: Add space after commas in HTTP/RTSP auth header 
This fixes access to Grandstream cameras, which return 401 to ffmpeg
otherwise.
VLC sends Authorization: header with spaces between parameters, and it
is known to work with Grandstream devices and broad range of other HTTP
and RTSP servers, so author considers switching to such behaviour safe.
Just for record - RFC 2617 (HTTP Auth) does not specify the need in
spaces, so this is not a bug of FFmpeg.

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-08 13:15:42 +02:00
DHE
83d75c70df libavformat/hlsenc: Use of uninitialized memory unlinking old files 
Fixes ticket#4900

Signed-off-by: DHE <git@dehacked.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 76e3f8242d607ac0394b7894196f83f8d02ce5ca)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-08 13:15:42 +02:00
Simon Thelen
9bbcd1cc7b lavf/webvttenc: Require webvtt file to contain exactly one WebVTT stream. 
Not requiring this can end up producing hilariously broken files
together with -c:s copy (e.g. a webvtt file containing binary subtitle data).

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b84232694ef0c6897e82b52326c9ea4027c69ec4)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-08 13:15:42 +02:00
Michael Niedermayer
1d42df7292 Add NOA credits 2015-09-08 22:31:44 +02:00
Zhang Rui
8cd24f8fe7 avformat/async: replace strerror with av_err2str 
Fixes CID1322337

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-06 11:56:54 +02:00
Michael Niedermayer
4eca1939ef avformat/hls: Check for av_opt_set_dict() failure 
Fixes: CID1320426

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-05 14:28:08 +02:00
Carl Eugen Hoyos
da8eb70dc3 lavf/aiffenc: Clarify an error message. 
Only one audio stream is allowed in aiff.
 2015-09-05 10:53:55 +02:00
Arnaud Bienner
0cdba4ac68 lavf/mxfdec: Support more codecs in mxf_picture_essence_container_uls[]. 
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2015-09-05 00:11:14 +02:00
Arnaud Bienner
35ab967f52 lavf/mxf: Support video essence container uls for vc1. 
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2015-09-05 00:09:13 +02:00
Arnaud Bienner
fd6b38bed7 lavf/riff: Support fourcc AVd1 for dvvideo. 
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2015-09-05 00:09:06 +02:00
Carl Eugen Hoyos
f7361dbcf4 lavc/mxfdec: Support more mxf files with codec_ul. 
Fixes decoding for the sample from ticket #4820.
 2015-09-04 23:50:34 +02:00
Michael Niedermayer
9ed53d5a8a avformat/mov: Change the type of the r/g/b variables 
Fixes integer overflow
Fixes: unknown_unknown_31b_795_cov_1818643045_raybauduc.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 22:17:00 +02:00
Stephan Holljes
280d140cb0 lavf/http: Remove superfluous parenthesis. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 20:11:29 +02:00
Stephan Holljes
dd7b486e8e lavf/http: Fix incorrectly placed parenthesis. 
The assignment had incorrectly placed parentheses which resulted in ret
always being > 0.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 18:55:49 +02:00
Michael Niedermayer
9f6ca28e32 avformat/concatdec: Check file variable before dereferencing 
Fixes CID1322328

Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 18:53:44 +02:00
Michael Niedermayer
fddcd9e570 avformat/file: Fix copy and paste error 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 12:42:40 +02:00
Michael Niedermayer
4cad4bd4ca avformat/hlsenc: Fix memleak of path 
Fixes: CID1322343
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 11:28:29 +02:00
Michael Niedermayer
e3d8504fd0 avformat/hlsenc: Initialize vtt_oc to help static analyzers 
This is also more robust in case it ever is used

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 11:28:29 +02:00
Michael Niedermayer
879603fa3f avformat/latmenc: Add assert to avoid coverity warning 
Fixes CID1322323

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 11:28:29 +02:00
Michael Niedermayer
bd70303ead avformat/swfdec: Check return value of init_get_bits8() 
Fixes: CID1322320

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 10:20:29 +02:00
Michael Niedermayer
053e80f6ea avformat/mov: Fix integer overflow in FFABS 
Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 09:20:57 +02:00
Michael Niedermayer
d1bdaf3fb2 avformat/dump: Fix integer overflow in aspect ratio calculation 
Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 02:50:41 +02:00
Marton Balint
26a0cd1b4b lavf: add V as a video stream specifier which is not an attached picture 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-09-02 21:35:21 +02:00
LiuQi
a4055d3e5d avformat/hlsenc: add a use_localtime option to expand the segment filename with localtime 
test examples:

./ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -v verbose -c copy -f hls -hls_segment_filename test-%s.ts -use_localtime 1 -bsf:v h264_mp4toannexb aaa.m3u8

[StevenLiu@localhost ffmpeg]$ cat aaa.m3u8;ll test-*.ts
test-1441052221.ts
test-1441052231.ts
test-1441052235.ts
test-1441052243.ts
test-1441052249.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:15 test-1441052131.ts
-rw-r--r--  1 StevenLiu  staff   495192  9  1 04:15 test-1441052141.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:17 test-1441052212.ts
-rw-r--r--  1 StevenLiu  staff  1067840  9  1 04:17 test-1441052221.ts
-rw-r--r--  1 StevenLiu  staff   235564  9  1 04:17 test-1441052231.ts
-rw-r--r--  1 StevenLiu  staff  1187220  9  1 04:17 test-1441052235.ts
-rw-r--r--  1 StevenLiu  staff   694848  9  1 04:17 test-1441052243.ts
-rw-r--r--  1 StevenLiu  staff   526588  9  1 04:17 test-1441052249.ts
[StevenLiu@localhost ffmpeg]$

./ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -v verbose -c copy -f hls -hls_segment_filename test-%s.ts -use_localtime 1 -bsf:v h264_mp4toannexb aaa.m3u8

[StevenLiu@localhost ffmpeg]$ cat aaa.m3u8;ll aaa-*.ts
aaa-1441052417.ts
aaa-1441052427.ts
aaa-1441052437.ts
aaa-1441052440.ts
aaa-1441052449.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:19 aaa-1441052382.ts
-rw-r--r--  1 StevenLiu  staff   277300  9  1 04:19 aaa-1441052392.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:20 aaa-1441052417.ts
-rw-r--r--  1 StevenLiu  staff  1067840  9  1 04:20 aaa-1441052427.ts
-rw-r--r--  1 StevenLiu  staff   235564  9  1 04:20 aaa-1441052437.ts
-rw-r--r--  1 StevenLiu  staff  1187220  9  1 04:20 aaa-1441052440.ts
-rw-r--r--  1 StevenLiu  staff   338776  9  1 04:20 aaa-1441052449.ts
[StevenLiu@localhost ffmpeg]$

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-02 04:31:32 +02:00
Carl Eugen Hoyos
3eae98c1ac lavf/dv: Do not return EIO for every error (like EOF). 
Fixes ticket #4818.

Reviewed-by: Ronald S. Bultje
Reviewed-by: Paul B Mahol
 2015-09-02 00:59:10 +02:00
Michael Niedermayer
c7c207aecd avformat/mxg: Use memmove() 
Fixes undefined behavior
Fixes: 1700002963a49da13542e0726b7bb758/unknown_unknown_292_658_cov_2141972066_m1.mxg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-01 22:46:23 +02:00
Petri Hintukainen
5d12d7de2c mpegts: demux BluRay text subtitles 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-01 14:35:32 +02:00
Petri Hintukainen
757cb0f286 mpegts: fix demuxing PES private stream 2 
PES header size is 6 bytes (00 00 01 bf XX XX), not 0.
BluRay text subtitles use private stream 2.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-01 14:35:32 +02:00
Andrew Stone
dc926ab518 rtmp: support the AMF_DATE tag 
Instead of returning EINVAL, which can cause a stream to fail to load, this
allows the tag to be passed through to the flv demuxer, where it's summarily
ignored.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-01 13:35:37 +02:00
Carl Eugen Hoyos
670d8ecfae lavf: Remove probesize32 and max_analyze_duration32 on version bump. 
Add FF_API_PROBESIZE_32 to allow removing 32bit probesize and 32bit
max_analyze_duration after the next libavformat version bump.
 2015-09-01 09:19:49 +02:00
Andreas Cadhalpun
c34363acd2 mux: warn if the encoders bitexact flag is set, but not the muxers 
Based-on-patch-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-08-30 23:30:09 +02:00
Michael Niedermayer
e2b19a533d avformat/segment: atomically update list if possible 
Fixes Ticket4802

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-28 00:09:56 +02:00
Stefano Sabatini
57cd2f7777 lavf/mpegenc: provide better feedback in case of invalid media type 2015-08-27 18:07:43 +02:00
Hendrik Leppkes
f5258a7d16 Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04' 
* commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04':
  webm: Explicitly select libvpx, libopus and libvorbis encoders

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:53:07 +02:00
Michael Niedermayer
81a8701eb5 avformat/oggenc: Check segments_count for headers too 
Fixes infinite loop and segfault in ogg_buffer_data()
Fixes Ticket4806

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-27 04:28:21 +02:00
Carl Eugen Hoyos
33908f0837 lavf/mov: Support unusual alac files without frma and alac atoms. 
Fixes ticket #4747.
 2015-08-27 03:29:29 +02:00
Michael Niedermayer
dda6925357 avformat/segment: Do not free the filename twice 
Bug introduced in 83a508cda5115c61b456aeb227bf770d61010961

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-26 03:50:52 +02:00
Timothy Gu
0c6a92a447 matroskaenc: Fix indentation 
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-25 16:03:49 -07:00
Stephan Holljes
4f860848ab lavf/http: Fix parsing http request data to not read over '\0'. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-25 19:51:13 +02:00