Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-12doc: fix spelling errorsAndreas Cadhalpun
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-12hls: only seek if there is an offsetAndreas Cadhalpun
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-12asfdec: add more checks for size left in asf packet bufferAlexandra Hájková
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-12asfdec: alloc enough space for storing name in asf_read_metadata_objAlexandra Hájková
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-09avformat/avidec: Workaround broken initial frameMichael Niedermayer
Fixes Ticket4851 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3e2ef00394b8079e93835d47c993868229f07502)
2015-10-09avformat/hls: fix some cases of HLS streams which require cookieswm4
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-09lavf/img2dec: Fix memory leakPrzemysław Sobala
Fixes #4886 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 01dd7e025c246d9001f1a30f4a5d8fa2936d1a5e)
2015-10-09avformat/srtdec: make sure we probe a numberClément Bœsch
Fixes regression since 7218352e0228028dfa009a3799ec93fd041065f1: WebVTT files were matching the SRT probing. (cherry picked from commit 40d9d6de90c3652f4c468ab14976c7faf5e40c07)
2015-10-08avformat/vobsub: compare correct packet stream IDswm4
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-08avformat/srtdec: more lenient first line probingClément Bœsch
Fixes Ticket #4898 (cherry picked from commit 7218352e0228028dfa009a3799ec93fd041065f1) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-08avformat/srtdec: fix number check for the first characterClément Bœsch
(cherry picked from commit d161a2a72b083c51ec8fad33a29283703f5fd0cc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-08avformat/httpauth: Add space after commas in HTTP/RTSP auth headerAndrey Utkin
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-08libavformat/hlsenc: Use of uninitialized memory unlinking old filesDHE
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-08lavf/webvttenc: Require webvtt file to contain exactly one WebVTT stream.Simon Thelen
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-09-08Add NOA creditsMichael Niedermayer
2015-09-06avformat/async: replace strerror with av_err2strZhang Rui
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-05avformat/hls: Check for av_opt_set_dict() failureMichael Niedermayer
Fixes: CID1320426 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-05lavf/aiffenc: Clarify an error message.Carl Eugen Hoyos
Only one audio stream is allowed in aiff.
2015-09-05lavf/mxfdec: Support more codecs in mxf_picture_essence_container_uls[].Arnaud Bienner
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2015-09-05lavf/mxf: Support video essence container uls for vc1.Arnaud Bienner
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2015-09-05lavf/riff: Support fourcc AVd1 for dvvideo.Arnaud Bienner
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2015-09-05lavc/mxfdec: Support more mxf files with codec_ul.Carl Eugen Hoyos
Fixes decoding for the sample from ticket #4820.
2015-09-03avformat/mov: Change the type of the r/g/b variablesMichael Niedermayer
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-03lavf/http: Remove superfluous parenthesis.Stephan Holljes
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-03lavf/http: Fix incorrectly placed parenthesis.Stephan Holljes
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-03avformat/concatdec: Check file variable before dereferencingMichael Niedermayer
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-03avformat/file: Fix copy and paste errorMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03avformat/hlsenc: Fix memleak of pathMichael Niedermayer
Fixes: CID1322343 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03avformat/hlsenc: Initialize vtt_oc to help static analyzersMichael Niedermayer
This is also more robust in case it ever is used Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03avformat/latmenc: Add assert to avoid coverity warningMichael Niedermayer
Fixes CID1322323 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03avformat/swfdec: Check return value of init_get_bits8()Michael Niedermayer
Fixes: CID1322320 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03avformat/mov: Fix integer overflow in FFABSMichael Niedermayer
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-03avformat/dump: Fix integer overflow in aspect ratio calculationMichael Niedermayer
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-02lavf: add V as a video stream specifier which is not an attached pictureMarton Balint
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-09-02avformat/hlsenc: add a use_localtime option to expand the segment filename ↵LiuQi
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-02lavf/dv: Do not return EIO for every error (like EOF).Carl Eugen Hoyos
Fixes ticket #4818. Reviewed-by: Ronald S. Bultje Reviewed-by: Paul B Mahol
2015-09-01avformat/mxg: Use memmove()Michael Niedermayer
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-01mpegts: demux BluRay text subtitlesPetri Hintukainen
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-01mpegts: fix demuxing PES private stream 2Petri Hintukainen
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-01rtmp: support the AMF_DATE tagAndrew Stone
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-01lavf: Remove probesize32 and max_analyze_duration32 on version bump.Carl Eugen Hoyos
Add FF_API_PROBESIZE_32 to allow removing 32bit probesize and 32bit max_analyze_duration after the next libavformat version bump.
2015-08-31mux: warn if the encoders bitexact flag is set, but not the muxersAndreas Cadhalpun
Based-on-patch-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-28avformat/segment: atomically update list if possibleMichael Niedermayer
Fixes Ticket4802 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-27lavf/mpegenc: provide better feedback in case of invalid media typeStefano Sabatini
2015-08-27Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'Hendrik Leppkes
* commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04': webm: Explicitly select libvpx, libopus and libvorbis encoders Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-27avformat/oggenc: Check segments_count for headers tooMichael Niedermayer
Fixes infinite loop and segfault in ogg_buffer_data() Fixes Ticket4806 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-27lavf/mov: Support unusual alac files without frma and alac atoms.Carl Eugen Hoyos
Fixes ticket #4747.
2015-08-26avformat/segment: Do not free the filename twiceMichael Niedermayer
Bug introduced in 83a508cda5115c61b456aeb227bf770d61010961 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-26matroskaenc: Fix indentationTimothy Gu
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-25lavf/http: Fix parsing http request data to not read over '\0'.Stephan Holljes
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>