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
2017-05-28movenc: encryption with time code track fixerankor
instead of deciding whether to encrypt based on the encryption scheme, decide according to whether cenc was initialized or not. mov_create_timecode_track calls ff_mov_write_packet with a track that doesn't have cenc initialized. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-27avformat/mov: add support for reading Content Light Level BoxJames Almer
As defined in "VP Codec ISO Media File Format Binding v1.0" https://github.com/webmproject/vp9-dash/blob/master/VPCodecISOMediaFileFormatBinding.md Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-27avformat/mov: add support for reading Mastering Display Metadata BoxJames Almer
As defined in "VP Codec ISO Media File Format Binding v1.0" https://github.com/webmproject/vp9-dash/blob/master/VPCodecISOMediaFileFormatBinding.md Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-27avformat/mux: Fix copy an paste typoMichael Niedermayer
Found-by: Roger Scott <rscott@grammatech.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-25avformat/mux: remove autobsf extradata propagation hackJames Almer
The offending bitstream filter was fixed, so this is no longer needed. Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-25avcodec/adtsenc: check packet side data for AAC extradata updatesJames Almer
This is in preparation for the following patch. Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-25avformat/latmenc: check packet side data for AAC extradata updatesJames Almer
This is in preparation for a following patch. Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-25avformat/matroskaenc: check packet side data for AAC extradata updatesJames Almer
This adapts and merges commit f4bf236338f6001736a4784b9c23de863057a583 from libav, originally skipped in 13a211e6320d061d9e8c29354c81239324b2db03 as it was not necessary back then. Is's applied now in preparation for the following patches, where the aac_adtstoasc bitstream filter will start to correctly propagate the new extradata through packet side data. Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-25avformat/movenc: always check for new extradata on a packetJames Almer
Don't just look at zero sized packets, and also check for AAC extradata updates, in preparation for the following patches. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-22lavf/hls: do not transfer custom IO flagClément Bœsch
See 0dcac9c3f0f8f32009098edb704fac4b08bac951
2017-05-22lavf/concatdec: do not transfer custom IO flagClément Bœsch
If the source is using a custom IO, setting this flag causes heavy leaks since the segments will not have their avio context closed. Regression since f5da453b068f55d335ca403d2e2b4dd2ac3d4331.
2017-05-22Use AVOnce as a static variable consistentlyHendrik Leppkes
Using AVOnce as a stack variable makes no sense as the state is lost when the function exits. This fixes repeated calls to av(filter/device)_register_all
2017-05-22lavf/img2: Add svg and svgz to allow reading image sequences.Carl Eugen Hoyos
Increase the return value for svg_probe() to make it != AVPROBE_SCORE_EXTENSION.
2017-05-22lavf/riff: Support more vlc fourcc's for 12 and 16 bit yuv4xx.Carl Eugen Hoyos
2017-05-20Merge commit 'e519dcd937c7c98815ba9884867590e302272016'Clément Bœsch
* commit 'e519dcd937c7c98815ba9884867590e302272016': dashenc: separate segments based on current segment duration Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20Merge commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92'Clément Bœsch
* commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92': dashenc: add option to provide UTC timing source Also use E instead of AV_OPT_FLAG_ENCODING_PARAM to be consistent with the other AVOption. Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20Merge commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee'Clément Bœsch
* commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee': dashenc: increase buffer time hint in the manifest Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20Merge commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18'Clément Bœsch
* commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18': dashenc: add mandatory id to AdaptationSet and Period in manifest Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20Merge commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a'Clément Bœsch
* commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a': dashenc: fix ISO8601 UTC parsing Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20lavf/mov: make invalid m{d,v}hd time_scale default to 1 instead of erroring outMatthieu Bouron
Some samples have their metadata track time_scale incorrectly set to 0 and the check introduced by a398f054fdb9b0f0b5a91c231fba6ce014143f71 prevents playback of those samples. Setting the time_scale to 1 fixes playback.
2017-05-19avformat/id3v2: Use ffio_ensure_seekback() in id3v2_read_internal()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-19avformat/aviobuf: Only downscale the buffer once it has been usedMichael Niedermayer
The code mistook the first iteration sometimes as the end Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-18avformat/movenc: remove experimental check for VP9 streamsJames Almer
The muxer has been updated and is now complaint with the v1.0 of the spec.
2017-05-16img2dec: use standard way to probe for svg/svgz filesRostislav Pehlivanov
2017-05-16img2dec: add support for piped SVG demuxingRostislav Pehlivanov
Only checks the extension and MIME type, since determining whether a file is SVG is difficult since they're just XML files. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-05-16movenc/isom: update vpcC box to version 1.0 of the specificationHendrik Leppkes
This brings our generation of the vpcC box up to date to version 1.0 of the VP Codec ISO Media File Format Binding. Specifically, color/transfer properties are now written with values based on ISO/IEC 23001-8, which is the same reference specification the AVColor* enumerations are based on.
2017-05-11avformat/hlsenc: move old_filename free operation earlierSteven Liu
Suggested-by: Aaron Levinson <alevinsn@aracnet.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-05-10avformat/wavdec: Check chunk_size李赞
Fixes integer overflow and out of array access Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-10libavformat/tcp: fix return code for tcp_acceptSimon Thelen
ff_accept can return AVERROR(ETIMEDOUT) and errno will be 0 (or undefined), return ret instead and return ff_neterror() in ff_poll_interrupt instead of AVERROR(errno) to parse WSAGetLastError on Windows. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-07avformat/matroskadec: fix resource leakSteven Liu
Fixes Coverity CID: 1405453 Reviewed-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-05-07rtmpproto: send swfverify value as swfurl if latter is unusedRicardo Constantino
Replicates lavf/librtmp.c behavior in L149-156 and rtmpdump's behavior with "--swfVfy <url>" passing the url to swfUrl. Fixes trac ticket #5549. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-06avformat/utils: free AVStream.codec properly in free_stream()Aaron Levinson
Fixes memory leaks. Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-05Merge commit '92db5083077a8b0f8e1050507671b456fd155125'James Almer
* commit '92db5083077a8b0f8e1050507671b456fd155125': build: Generate pkg-config files from Make and not from configure build: Store library version numbers in .version files Includes cherry-picked commits 8a34f3659371680ca523aecfd9098c28f0f809eb and ee164727dd64c199b87118917e674b17c25e0da3 to fix issues. Changes were also made to retain support for raise_major and build_suffix. Reviewed-by: ubitux Merged-by: James Almer <jamrial@gmail.com>
2017-05-04avformat/concatdec: port to the new bitstream filter APIJames Almer
Reviewed-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-03Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'Clément Bœsch
* commit '11a9320de54759340531177c9f2b1e31e6112cc2': build: Move build-system-related helper files to a separate subdirectory "ffbuild" directory name is used instead of "avbuild". Merged-by: Clément Bœsch <u@pkh.me>
2017-05-02lavf/nutdec: Fix an impossible condition, regression since e0c53c34.Carl Eugen Hoyos
Fixes ticket #6362.
2017-05-01libavformat/http: Ignore expired cookiesMicah Galizia
Signed-off-by: Micah Galizia <micahgalizia@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-01avformat/matroskaenc: add support for writing Content Light Level elementsJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-01avformat/matroskadec: export Content Light Level metadataJames Almer
Based on a patch by Hendrik Leppkes Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-29Merge commit '46191a2da16f751e53d93646ae1388d421d12bee'Clément Bœsch
* commit '46191a2da16f751e53d93646ae1388d421d12bee': mov: fix a possible invalid read in mov_read_mac_string() Merged-by: Clément Bœsch <u@pkh.me>
2017-04-29avformat/movenc: Explicitly address potential division by zero.Lucas Cooper
find_fps attempts to infer framerate from AVCodec's timebase. When this results in a frame rate that isn't explicitly marked as supported in av_timecode_check_frame_rate, find_fps returns the AVStream's avg_frame_rate, which, per avformat.h, _may_ be set (or not). mov_get_mpeg2_xdcam_codec_tag, mov_get_h264_codec_tag and find_compressor attempt to call av_q2d on the return value of find_fps, which in the above case, may result in division by zero and therefore, an undefined frame rate when NaN is converted to int. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-28avformat/hlsenc: fix CID 1405135Steven Liu
Fixes Coverity CID: 1405135 Reviewed-by: Rodger Combs <rodger.combs@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-04-28avformat/hlsenc: hold old key info when append listSteven Liu
fix ticket id: #6353 Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-04-26Merge commit 'a4fec9a7eab842ea5eea1b1ee98624356cb31422'Clément Bœsch
* commit 'a4fec9a7eab842ea5eea1b1ee98624356cb31422': rtmppkt: Check for packet size mismatches See 7d57ca4d9a75562fa32e40766211de150f8b3ee7 Merged-by: Clément Bœsch <u@pkh.me>
2017-04-26Merge commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2'Clément Bœsch
* commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2': libavformat: Fix a faulty api deprecation guard in prepare_input_packet Merged-by: Clément Bœsch <u@pkh.me>
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>