summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/ituh263dec: Correct timestamp recovery for B framesMichael Niedermayer2017-02-01
| | | | | | Improves u263_b-frames_5.avi Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wmalosslessdec: remove warning message as bug is fixedPaul B Mahol2017-02-01
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/msf: support codec 1, which is 16 bit pcm lePaul B Mahol2017-02-01
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/atrac3: Add multichannel joint stereo ATRAC3bnnm2017-02-01
| | | | | | | | | | | | | | | | | | | | | | Multichannel joint stereo simply interleaves stereo pairs (6ch: 2ch + 2ch + 2ch), so each pair is decoded separatedly. *** To test my changes, I converted examples to wav with ffmpeg.exe (old and new), and compared them to see they are byte-exact. Regular 2ch files (JS and normal) were straightforward to test. For multichannel, to check each JS pair is correctly decoded separatedly I did: - manually demux 6ch.msf into 3 pairs and convert them (2ch_1.wav + 2ch_2.wav + 2ch_3.wav) - convert the 6ch.msf file to wav (with my changes) - manually demux the 6ch.wav into 3 pairs (6ch_d1.wav + 6ch_d2.wav + 6ch_d3.wav) - compare each pair (ex. 2ch_3.wav vs 6ch_d3.wav): all pairs are byte-exact. The new code just processes each JS pair separatedly, there are no algorithm changes. It could be improved a bit but I'm not sure about typical styles. I've only seen 6ch .MSF (probably the AT3 spec only supports 2ch audio). Signed-off-by: bnnm <bananaman255@gmail.com>
* avcodec/h263: Remove disabled and wrong code from ff_h263_loop_filter()Michael Niedermayer2017-02-01
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ituh263dec: Use correct error codes in ff_h263_decode_mb()Michael Niedermayer2017-02-01
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ituh263dec: Correct indentionMichael Niedermayer2017-02-01
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/error_resilience: Remove two unused variables.Carl Eugen Hoyos2017-02-01
|
* avcodec/ituh263dec: Implement B frame support with UMVMichael Niedermayer2017-02-01
| | | | | | | | | | Fixes: u263_b-frames_1.avi Fixes part of Ticket1536 return -1 is used here as it is used in similar code in this function, I intend to replace it by proper error codes in the whole function. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '90bc423212396e96a02edc1118982ab7f7766a63'Clément Bœsch2017-02-01
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '90bc423212396e96a02edc1118982ab7f7766a63': mov: Wrap stsc index and count compare in a separate function The mov_stsc_index_valid() function is replaced with a macro to prevent signdness issues (index is not always signed, and count is always unsigned currently). The comparison is also adjusted to reduce the risk of overflows. Merged-by: Clément Bœsch <u@pkh.me>
| * mov: Wrap stsc index and count compare in a separate functionVittorio Giovara2016-07-20
| |
* | mov: add fate test for decryption with edit listerankor2017-02-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | mov: fix decryption with edit listerankor2017-02-01
| | | | | | | | | | | | | | | | | | | | Retain the ranges of frame indexes when applying edit list in mov_fix_index. The index ranges are then used to keep track of the frame index of the current sample. In case of a discontinuity in frame indexes due to edit, update the auxiliary info position accordingly. Reviewed-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '209ee680ce99035202520b900326a57f7fa0aceb'Clément Bœsch2017-02-01
|\| | | | | | | | | | | | | | | | | * commit '209ee680ce99035202520b900326a57f7fa0aceb': mov: Fix stsc_count comparison This commit is a noop, see 3c058f570128dcfa3a68f0860e2be7f098e8d6e1 Merged-by: Clément Bœsch <u@pkh.me>
| * mov: Fix stsc_count comparisonMatthieu Bouron2016-07-20
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | ffmpeg_cuvid: add 420 10-bit transcode support for hwaccel cuvidsumit2017-02-01
| | | | | | | | Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* | Merge commit 'a1f6a2dfdaf9beb42ca66e49d10bfaf5905a0128'Clément Bœsch2017-02-01
|\| | | | | | | | | | | | | | | | | | | * commit 'a1f6a2dfdaf9beb42ca66e49d10bfaf5905a0128': ratecontrol: Reorder functions to avoid forward declarations Merged, but this seems to break the clear separation of 1-pass vs 2-pass. Merged-by: Clément Bœsch <u@pkh.me>
| * ratecontrol: Reorder functions to avoid forward declarationsVittorio Giovara2016-07-20
| |
* | Merge commit 'd639dcdae022130078c9c84b7b691c5e9694786c'Clément Bœsch2017-02-01
|\| | | | | | | | | | | | | * commit 'd639dcdae022130078c9c84b7b691c5e9694786c': ratecontrol: Move Xvid-related functions to the place they are actually used Merged-by: Clément Bœsch <u@pkh.me>
| * ratecontrol: Move Xvid-related functions to the place they are actually usedVittorio Giovara2016-07-20
| | | | | | | | This will simplify the de-MpegEncContextualization.
* | Merge commit '44972e227df0f7ad5aa9004d971fb54e9dc5c849'Clément Bœsch2017-02-01
|\| | | | | | | | | | | | | | | | | | | * 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>
| * ratecontrol: Move mpegenc-only function where it is usedVittorio Giovara2016-07-20
| |
* | boadec: remove log messagesAndreas Cadhalpun2017-02-01
| | | | | | | | | | Requested-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | pgssubdec: reset rle_data_len/rle_remaining_len on allocation errorAndreas Cadhalpun2017-02-01
| | | | | | | | | | | | | | | | 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>
* | Revert "Merge commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553'"Michael Niedermayer2017-02-01
| | | | | | | | | | | | | | | | | | 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>
* | avcodec/mjpegdec: Check for for the bitstream end in ↵Michael Niedermayer2017-02-01
| | | | | | | | | | | | | | | | | | | | 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>
* | tools/target_dec_fuzzer: Only audio uses the return value to decode packets ↵Michael Niedermayer2017-01-31
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052'James Almer2017-01-31
|\| | | | | | | | | | | | | * commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052': ratecontrol: Drop commented out cruft Merged-by: James Almer <jamrial@gmail.com>
| * ratecontrol: Drop commented out cruftVittorio Giovara2016-07-20
| |
* | Merge commit 'd06dfaa5cbdd20acfd2364b16c0f4ae4ddb30a65'James Almer2017-01-31
|\| | | | | | | | | | | | | * commit 'd06dfaa5cbdd20acfd2364b16c0f4ae4ddb30a65': x86: huffyuv: Use EXTERNAL_SSSE3_FAST convenience macro where appropriate Merged-by: James Almer <jamrial@gmail.com>
| * x86: huffyuv: Use EXTERNAL_SSSE3_FAST convenience macro where appropriateDiego Biurrun2016-07-20
| |
* | Merge commit '8e9cd81d291b1010c625b2766058aadf4affb537'James Almer2017-01-31
|\| | | | | | | | | | | | | * commit '8e9cd81d291b1010c625b2766058aadf4affb537': x86: cpu: Detect Conroe CPUs and their slow shuffle unit Merged-by: James Almer <jamrial@gmail.com>
| * x86: cpu: Detect Conroe CPUs and their slow shuffle unitFiona Glaser2016-07-20
| |
* | Merge commit '7d7355aa92bb36ca0765c49a569a999bcb96f332'James Almer2017-01-31
|\| | | | | | | | | | | | | * commit '7d7355aa92bb36ca0765c49a569a999bcb96f332': x86: Add SSSE3_SLOW CPU flag and related convenience macros Merged-by: James Almer <jamrial@gmail.com>
| * x86: Add SSSE3_SLOW CPU flag and related convenience macrosDiego Biurrun2016-07-20
| |
* | Merge commit '4efab89332ea39a77145e8b15562b981d9dbde68'James Almer2017-01-31
|\| | | | | | | | | | | | | * commit '4efab89332ea39a77145e8b15562b981d9dbde68': x86: Use *_FAST/*_SLOW CPU feature detection macros where appropriate Merged-by: James Almer <jamrial@gmail.com>
| * x86: Use *_FAST/*_SLOW CPU feature detection macros where appropriateDiego Biurrun2016-07-20
| |
* | Merge commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553'James Almer2017-01-31
|\| | | | | | | | | | | | | * commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553': x86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific code Merged-by: James Almer <jamrial@gmail.com>
| * x86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific codeDiego Biurrun2016-07-20
| | | | | | | | That code is only ever initialized with that flag set.
* | Merge commit '95c1df929b92d81454656c222a35ec5f7db576b4'James Almer2017-01-31
|\| | | | | | | | | | | | | * commit '95c1df929b92d81454656c222a35ec5f7db576b4': x86: hpeldsp: Drop unused function parameters Merged-by: James Almer <jamrial@gmail.com>
| * x86: hpeldsp: Drop unused function parametersDiego Biurrun2016-07-20
| |
* | Merge commit 'c3e83ad3b7d75f3597f47ada2616ba4479665009'James Almer2017-01-31
|\| | | | | | | | | | | | | * commit 'c3e83ad3b7d75f3597f47ada2616ba4479665009': x86: hpeldsp: Use EXTERNAL_SSE2_FAST where appropriate Merged-by: James Almer <jamrial@gmail.com>
| * x86: hpeldsp: Use EXTERNAL_SSE2_FAST where appropriateDiego Biurrun2016-07-20
| |
* | Merge commit '1dfc3cf89d0eb026af28be46294b85d79499ffb5'James Almer2017-01-31
|\| | | | | | | | | | | | | * commit '1dfc3cf89d0eb026af28be46294b85d79499ffb5': x86: hpeldsp: Split off VP3-specific bits into a separate file Merged-by: James Almer <jamrial@gmail.com>
| * x86: hpeldsp: Split off VP3-specific bits into a separate fileDiego Biurrun2016-07-20
| |
* | MAINTAINERS: Add myself for boadec.cMichael Niedermayer2017-01-31
| | | | | | | | | | | | It seems ive written this thing though i cannot really remember Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2'Clément Bœsch2017-01-31
|\| | | | | | | | | | | | | * commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2': examples: Properly free AVCodecContext Merged-by: Clément Bœsch <cboesch@gopro.com>
| * examples: Properly free AVCodecContextVittorio Giovara2016-07-20
| |
* | Merge commit '0e0538aefc75958ded49f5d075c99a81cf6b2bbb'Clément Bœsch2017-01-31
|\| | | | | | | | | | | | | | | | | * 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>
| * avprobe: Zero the allocated avio buffer memoryVittorio Giovara2016-07-20
| | | | | | | | | | Fixes valgrind warning "Conditional jump or move depends on uninitialised value(s)." from avio_flush().
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 05:31:13 +0000