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-02-01Merge commit 'd639dcdae022130078c9c84b7b691c5e9694786c'Clément Bœsch
* commit 'd639dcdae022130078c9c84b7b691c5e9694786c': ratecontrol: Move Xvid-related functions to the place they are actually used Merged-by: Clément Bœsch <u@pkh.me>
2017-02-01Merge commit '44972e227df0f7ad5aa9004d971fb54e9dc5c849'Clément Bœsch
* commit '44972e227df0f7ad5aa9004d971fb54e9dc5c849': ratecontrol: Move mpegenc-only function where it is used This commit is a noop. ff_write_pass1_stats() is used in snowenc as well. Merged-by: Clément Bœsch <u@pkh.me>
2017-02-01boadec: remove log messagesAndreas Cadhalpun
Requested-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2017-02-01pgssubdec: reset rle_data_len/rle_remaining_len on allocation errorAndreas Cadhalpun
The code relies on their validity and otherwise can try to access a NULL object->rle pointer, causing segmentation faults. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2017-02-01Revert "Merge commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553'"Michael Niedermayer
The assumption this is based on is wrong, the code is not always run with bitexact flags This reverts commit a956164e1eb3418922cae949f02ad4035f013213, reversing changes made to f6005907fdeb9e4de37568ed5c1a8e7b869126f6. Approved-by: James Almer <jamrial@gmail.com>
2017-02-01avcodec/mjpegdec: Check for for the bitstream end in ↵Michael Niedermayer
mjpeg_decode_scan_progressive_ac() Fixes timeout Fixes: 496/clusterfuzz-testcase-5805083497332736 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-01tools/target_dec_fuzzer: Only audio uses the return value to decode packets ↵Michael Niedermayer
in pieces, correct the code to match that Fixes: Timeout Fixes: 483/fuzz-0-ffmpeg_VIDEO_AV_CODEC_ID_H263I_fuzzer Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-31Merge commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052'James Almer
* commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052': ratecontrol: Drop commented out cruft Merged-by: James Almer <jamrial@gmail.com>
2017-01-31Merge commit 'd06dfaa5cbdd20acfd2364b16c0f4ae4ddb30a65'James Almer
* commit 'd06dfaa5cbdd20acfd2364b16c0f4ae4ddb30a65': x86: huffyuv: Use EXTERNAL_SSSE3_FAST convenience macro where appropriate Merged-by: James Almer <jamrial@gmail.com>
2017-01-31Merge commit '8e9cd81d291b1010c625b2766058aadf4affb537'James Almer
* commit '8e9cd81d291b1010c625b2766058aadf4affb537': x86: cpu: Detect Conroe CPUs and their slow shuffle unit Merged-by: James Almer <jamrial@gmail.com>
2017-01-31Merge commit '7d7355aa92bb36ca0765c49a569a999bcb96f332'James Almer
* commit '7d7355aa92bb36ca0765c49a569a999bcb96f332': x86: Add SSSE3_SLOW CPU flag and related convenience macros Merged-by: James Almer <jamrial@gmail.com>
2017-01-31Merge commit '4efab89332ea39a77145e8b15562b981d9dbde68'James Almer
* commit '4efab89332ea39a77145e8b15562b981d9dbde68': x86: Use *_FAST/*_SLOW CPU feature detection macros where appropriate Merged-by: James Almer <jamrial@gmail.com>
2017-01-31Merge commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553'James Almer
* commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553': x86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific code Merged-by: James Almer <jamrial@gmail.com>
2017-01-31Merge commit '95c1df929b92d81454656c222a35ec5f7db576b4'James Almer
* commit '95c1df929b92d81454656c222a35ec5f7db576b4': x86: hpeldsp: Drop unused function parameters Merged-by: James Almer <jamrial@gmail.com>
2017-01-31Merge commit 'c3e83ad3b7d75f3597f47ada2616ba4479665009'James Almer
* commit 'c3e83ad3b7d75f3597f47ada2616ba4479665009': x86: hpeldsp: Use EXTERNAL_SSE2_FAST where appropriate Merged-by: James Almer <jamrial@gmail.com>
2017-01-31Merge commit '1dfc3cf89d0eb026af28be46294b85d79499ffb5'James Almer
* commit '1dfc3cf89d0eb026af28be46294b85d79499ffb5': x86: hpeldsp: Split off VP3-specific bits into a separate file Merged-by: James Almer <jamrial@gmail.com>
2017-01-31MAINTAINERS: Add myself for boadec.cMichael Niedermayer
It seems ive written this thing though i cannot really remember Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-31Merge commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2'Clément Bœsch
* commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2': examples: Properly free AVCodecContext Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit '0e0538aefc75958ded49f5d075c99a81cf6b2bbb'Clément Bœsch
* commit '0e0538aefc75958ded49f5d075c99a81cf6b2bbb': avprobe: Zero the allocated avio buffer memory This commit is a noop, no such thing exists in ffprobe. Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d'Clément Bœsch
* commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d': libdc1394: Fill in packet data directly Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit 'e344e65109f1a75ca82aff4cecec44e79197753c'Clément Bœsch
* commit 'e344e65109f1a75ca82aff4cecec44e79197753c': h264dec: do not call finish_setup() if we have not started a frame This commit is a noop, see bdbbb8f11edbf10add874508c5125c174d8939be Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit '76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4'Clément Bœsch
* commit '76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4': h264dec: handle zero-sized NAL units in get_last_needed_nal() See 641dccc2aa5e0bf6b3c06998f9a7f24a5cf725e7 Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit '1f7b4f9abc6bae94e576e710b8d10117ca3c8238'Clément Bœsch
* commit '1f7b4f9abc6bae94e576e710b8d10117ca3c8238': h264dec: make sure not to call finish_setup() more than once per frame This commit is a noop, see bdbbb8f11edbf10add874508c5125c174d8939be Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit 'da917fcf5183ed249ad1285b8edd330f421376c4'Clément Bœsch
* commit 'da917fcf5183ed249ad1285b8edd330f421376c4': avconv_dxva2: add a profile check for hevc This commit is a noop, see a655bc834479024ff4d60d0b8ecca290e73eb96c Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31lavc/hevc: remove a few random spaces to reduce diff with libavClément Bœsch
2017-01-31Merge commit '1ecb63cd1c1a4ddc5efed4abbc3158b969d8c5e4'Clément Bœsch
* commit '1ecb63cd1c1a4ddc5efed4abbc3158b969d8c5e4': hevc: set profile based on the profile compatibility flags if needed This commit is a noop, see f85cc3bf12236e974403667610b39b802b8651d6 Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit 'fca3c3b61952aacc45e9ca54d86a762946c21942'Clément Bœsch
* commit 'fca3c3b61952aacc45e9ca54d86a762946c21942': hevc: Add AVX2 DC IDCT Mostly noop as we already have that code. In the ASM, code is merged with the exception of SECTION which is kept uppercase for consistency with the rest of the codebase. Still in the ASM, the prototype comment is fixed to honor the '_' added from the original commit. idct_dc_proto() is dropped as it's not used anymore here. Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit 'cc16da75c2f99d92f7a6461100f041352deb6d88'Clément Bœsch
* commit 'cc16da75c2f99d92f7a6461100f041352deb6d88': hevc: Add coefficient limiting to speed up IDCT Noop again as we have these changes already, only random spacing changes. Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit 'a92fd8a06256e71a0be87b03751ec3c2a4a8aa21'Clément Bœsch
* commit 'a92fd8a06256e71a0be87b03751ec3c2a4a8aa21': hevc: Add DC IDCT Noop, only spacing adjusted. Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit '4f247de3b797cdc9d243d26534412f81c306e5b5'Clément Bœsch
* commit '4f247de3b797cdc9d243d26534412f81c306e5b5': hevcdsp_template: Templatize IDCT This commit is a noop as we already have that code from a previous commits (see 92cccb7bcd79845020ed8abebf35170c182443b2). Spacing is adjusted to reduce the diff. Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31Merge commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d'Clément Bœsch
* commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d': hevc: Separate adding residual to prediction from IDCT This commit should be a noop but isn't because of the following renames: - transform_add → add_residual - transform_skip → dequant - idct_4x4_luma → transform_4x4_luma Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31doc/muxers: add AVI muxer documentationTobias Rapp
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-01-31avfilter/overlay: add gbrp output formatPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-31lavc/alac: Export samplerate.Carl Eugen Hoyos
Fixes ticket #6096.
2017-01-31lavf/xwma: fix incorrect format specifierMoritz Barsnick
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
2017-01-31avformat/avienc: add reserve_index_space optionTobias Rapp
Allows the user to reserve space for the ODML master index. A sufficient sized master index in the AVI header avoids storing follow-up master indexes within the 'movi' data later. If the option is omitted or zero the index size is estimated from output duration and bitrate. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-01-31ircamdec: prevent overflow during block alignment calculationAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2017-01-31avutil/frame: fix av_frame_copy for unknown layoutsMarton Balint
I wonder how unknown layouts ever worked without this? Reviewed-by: Nicolas George <george@nsup.org> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
2017-01-31avformat/mov: Fix integer truncation in mov_read_uuid()Michael Niedermayer
Fixes Ticket6102 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-30avfilter: add threshold filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-30avformat/msf: fix codec 4 (joint stereo ATRAC3) and alignbnnm
Codec 4 (frame size 98) uses joint stereo per spec and examples. Also removed an incorrect "align" var which wasn't used anyway (it was overwrittern). Probably all/only .AT3 of frame size 98 are JS, too. Signed-off-by: bnnm <bananaman255@gmail.com>
2017-01-30avformat/Makefile: fix compilation of testprogs when networking is disabledTobias Rapp
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-01-30doc/libav-merge: add unmerged hevc commits hashesClément Bœsch
2017-01-30lavc/hevcdsp: fix pretty printing mistakeClément Bœsch
"Issue" introduced in 83976e40e89655162e5394cf8915d9b6d89702d9.
2017-01-30avutil/eval: add atan2 functionPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-30avformat: add SCC muxerPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-30avformat/sccdec: simplify 2 sscanf callsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-30xvag: prevent overflow during block alignment calculationAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2017-01-30epafdec: prevent overflow during block alignment calculationAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2017-01-30genh: prevent overflow during block alignment calculationAndreas Cadhalpun
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>