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

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-04-26avformat/concatdec: fix the h264 annexb extradata checkJames Almer
The start code can be either in the first three or four bytes.
2017-04-23webm_dash_manifest_demuxer: Fix initialization range for files with cues at ↵Derek Buitenhuis
the front The WebM DASH spec states: The Initialization Segment shall not contain Clusters or Cues. The Segment Index corresponds to the Cues. Previously, it included the cues if they were at the front. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2017-04-23webm_dash_manifest_demuxer: Fix UB in cue timestamp string code and make it ↵Derek Buitenhuis
actually work Output was apparently not tested for correctness. Passing overlapping memory to snprintf causes undefined behavior, and usually resulted in only the very last timestamp being written to metadata, and not a list at all. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2017-04-23avformat: do not use AVFrame accessorMuhammad Faiz
Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2017-04-20avformat/webmdashenc: Validate the 'streams' adaptation sets parameterDerek Buitenhuis
It should not be a value larger than the number of streams we have, or it will cause invalid reads and/or SIGSEGV. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-20avformat/webmdashenc: Require the 'adaptation_sets' option to be setDerek Buitenhuis
This seems to be non-optional, and if the muxer is run without it, strlen() is run on NULL, causing a segfault. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-20lavf/mov: Only copy extradata if it exists.Carl Eugen Hoyos
Avoids undefined call of memcpy(ptr, NULL, 0);
2017-04-18avcodec: add Screen Recorder Gold Codec decoderPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-18avcodec: add Mandsoft Screen Capture Codec decoderPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-17matroskadec,cosmetics: fix a couple typosJames Zern
Signed-off-by: James Zern <jzern@google.com>
2017-04-17webm_dash_manifest: Add option to specify bandwidthVignesh Venkatasubramanian
Add an option to webm_dash_manifest demuxer to specify a value for "bandwidth" field in the DASH manifest. The value is then used by the muxer. Fixes an existing FIXME in the code. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: James Zern <jzern@google.com>
2017-04-14avformat/hlsenc: add hls encrypt optionsSteven Liu
refer to: https://git.libav.org/?p=libav.git;a=commitdiff;h=0a4b9d0ccd10b3c39105f99bd320f696f69a75a2 add hls encrypt options looks like libav's libavformat/hlsenc.c Reviewed-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-04-14Merge commit '3f75e5116b900f1428aa13041fc7d6301bf1988a'James Almer
* commit '3f75e5116b900f1428aa13041fc7d6301bf1988a': avio: Keep track of the amount of data written Merged-by: James Almer <jamrial@gmail.com>
2017-04-13Merge commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'Hendrik Leppkes
* commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca': build: Separate avisynth and avxsynth support Mostly noop, since it could break linux configure with --enable-avisynth, and the configure code which was simplified isn't even present in ffmpeg. Only merged the cosmetic re-ordering in the Makefile. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2017-04-13avformat/movenc: Fix potential leak of sgpd_entries array.Matthew Gregan
Signed-off-by: Matthew Gregan <kinetik@flim.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-12lavf/isom: Remove codec point for WMAv2 that has never worked.Carl Eugen Hoyos
2017-04-12avformat/movenc: Fix mix of declaration and statementMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-11avformat/mo: Add experimental demuxing support for Opus in ISO BMFF (MP4).Matthew Gregan
Based on the draft spec at http://vfrmaniac.fushizen.eu/contents/opus_in_isobmff.html Signed-off-by: Matthew Gregan <kinetik@flim.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-11avformat/movenc: Add experimental muxing support for Opus in ISO BMFF (MP4).Matthew Gregan
Based on the draft spec at http://vfrmaniac.fushizen.eu/contents/opus_in_isobmff.html '-strict -2' is required to create files in this format. Signed-off-by: Matthew Gregan <kinetik@flim.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-11avformat/oggparseogm: Check ff_alloc_extradata() for failureMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-11avformat/oggparseogm: Check available data before reading global headerMichael Niedermayer
Fixes use of uninitialized data Found-by: Thomas Guilbert <tguilbert@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-10avformat/movenc: auto insert vp9_superframe bsf when neededJames Almer
Experimental VP9 support was added to the muxer recently. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-09Merge commit '3794062ab1a13442b06f6d76c54dce51ffa54697'Clément Bœsch
* commit '3794062ab1a13442b06f6d76c54dce51ffa54697': Remove Plan 9 support Merged-by: Clément Bœsch <u@pkh.me>
2017-04-08avformat/matroskaenc: don't try to update flac extradata if live streamingJames Almer
2017-04-07lavf: use the new bitstream filter for extracting extradataJames Almer
This merges commits 8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4 and 096a8effa3f8f3455292c958c3ed07e798def7bd by Anton Khirnov, with the following change: - extract_extradata_check() is added to know if the codec is supported by the bsf before trying to initialize it. This behaviour is similar to the old AVCodecParser.split checks. The FATE reference changes are due to the filtered out NAL units that the old AVCodecParser.split implementation left alone. Decoding is unchanged as the functions that parse extradata simply ignored said unnecessary NAL units. Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-06avformat/dump : Display Content Light Level metadataSteve Lhomme
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-06libavformat/mov: Fix memory leak, need to free the chapter tracks arrayThierry Foucu
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-06avformat/ftp: Solve a crash bug when network occur a exceptiontiejun.peng@foxmail.com
This fixes a proble where ffmpeg would cause crash to do a seek when the network disconnect. The log like this: 01-01 10:53:03.441 6580 6580 F DEBUG : backtrace: 01-01 10:53:03.441 6580 6580 F DEBUG : #00 pc 0002942e /system/lib/libavformat.so (ffurl_write+9) Signed-off-by: tiejun.peng <tiejun.peng@foxmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-05rtp: rfc4175: add handler for YCbCr-4:2:2Damien Riegel
This adds partial support for the RFC 4175 (raw video over RTP). The only supported formats are the YCbCr-4:2:2 8 bit because it's natively supported by FFmpeg with pixel format UYVY, and 10 bit which requires the vrawdepay codec to convert the payload in a format handled by FFmpeg. Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-04Merge commit '537b5b773b317af79d3a5b576ee9683e15ed84f6'James Almer
* commit '537b5b773b317af79d3a5b576ee9683e15ed84f6': rtmpdh: Do global initialization before running the test Merged-by: James Almer <jamrial@gmail.com>
2017-04-04avformat/mov: Check creation_time for overflowMichael Niedermayer
Fixes integer overflow Fixes: 701640 Found-by: Found-by: Thomas Guilbert <tguilbert@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-02Bump versions for master after 3.3Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-02Bump minor for 3.3Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-01avformat/oggparsedaala: Do not leave an invalid value in gpshiftMichael Niedermayer
Fixes: undefined behavior Fixes: 702974 Found-by: Thomas Guilbert <tguilbert@google.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-01avformat/oggparsedaala: Check duration for AV_NOPTS_VALUEMichael Niedermayer
This avoids an integer overflow the solution matches oggparsevorbis.c and 45581ed15d2ad5955e24d809820c1675da68f500 Fixes: 700242 Found-by: Thomas Guilbert <tguilbert@google.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-01Merge commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88'Clément Bœsch
* commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88': crypto: Add encryption support See 00d4013d9f841c189a2f10dd05526ca40129b880 Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01Merge commit '3cc3463f306f425f76bd962755df1132eeac6dfa'Clément Bœsch
* commit '3cc3463f306f425f76bd962755df1132eeac6dfa': avisynth: Support pix_fmts added to AviSynth+ This commit is mostly a noop, see 92916e8542e425ca20daddb490261a5818643206. Cosmetics and a small fix are merged. Merged-by: Clément Bœsch <u@pkh.me>
2017-03-31Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'James Almer
* commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6': Drop pointless void* casts Merged-by: James Almer <jamrial@gmail.com>
2017-03-31avformat/dump: use av_spherical_projection_name() to print spherical ↵James Almer
projection names Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31lavf/amr: Return AVERROR_EOF on EOF.Carl Eugen Hoyos
Fixes ticket #6280.
2017-03-31lavf/mov.c: Add -advanced_editlist option for mov format.Sasi Inguva
Adding an MOV format option to turn on/off the editlist supporting code, introduced in https://github.com/FFmpeg/FFmpeg/commit/ca6cae73db207f17a0d5507609de12842d8f0ca3 Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31Bump minor versions for master after release/3.3 branchpointMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31Bump minor versions for staring release/3.3 branchMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31Merge commit '67deba8a416d818f3d95aef0aa916589090396e2'Clément Bœsch
* commit '67deba8a416d818f3d95aef0aa916589090396e2': Use avpriv_report_missing_feature() where appropriate Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31avformat/mov: Init ref_sc / ref_st to NULLMichael Niedermayer
This is more robust in case some change or corner case causes them to be dereferenced before being set Fixes CID1396274, CID1396275 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31avformat/libopenmpt: Check for avio_size() failureMichael Niedermayer
Fixes CID1396850 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30avformat/mux: Check return code of av_packet_split_side_data()Michael Niedermayer
Fixes CID1403225 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30avformat/nut: Add HEVC and Opus supportLeo Izen
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30Merge commit '67351924fa91dea4339109100a4c0689f006581f'Clément Bœsch
* commit '67351924fa91dea4339109100a4c0689f006581f': Drop unreachable break and return statements Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-29Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'Clément Bœsch
* commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6': rtmpproto: Restructure zlib code to avoid unreachable code warning Merged-by: Clément Bœsch <u@pkh.me>