]>
git.sesse.net Git - ffmpeg/log
Clément Bœsch [Thu, 2 Feb 2017 10:39:30 +0000 (11:39 +0100)]
Merge commit '
9064777dbb335ab4809ae09e3fdcc0245f925cdc '
* commit '
9064777dbb335ab4809ae09e3fdcc0245f925cdc ':
checkasm: add HEVC test for testing IDCT DC
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 2 Feb 2017 10:35:07 +0000 (11:35 +0100)]
Merge commit '
7f549b8338ed3775fec4bf10421ff5744e5866dd '
* commit '
7f549b8338ed3775fec4bf10421ff5744e5866dd ':
riff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain that data.
Only cosmetics, the change was already present.
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 2 Feb 2017 10:29:53 +0000 (11:29 +0100)]
Merge commit '
6135c3b61e084be93c0876cecd06f4e764f961c0 '
* commit '
6135c3b61e084be93c0876cecd06f4e764f961c0 ':
Revert "avprobe: Zero the allocated avio buffer memory"
This commit is a noop, see
591cf8aa0ee9e09aac29861f4229616df7604172
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 2 Feb 2017 10:26:05 +0000 (11:26 +0100)]
Merge commit '
f637046d3134a331e4b5a7243ac3dfb92735b8a5 '
* commit '
f637046d3134a331e4b5a7243ac3dfb92735b8a5 ':
libavutil: Always use some GCC style attributes on clang
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 2 Feb 2017 10:22:04 +0000 (11:22 +0100)]
Merge commit '
6f9e34baea4f6f484392e4e67f606a0835d07b73 '
* commit '
6f9e34baea4f6f484392e4e67f606a0835d07b73 ':
arm: Check for support for the .fpu directive
Merged-by: Clément Bœsch <cboesch@gopro.com>
Matthieu Bouron [Thu, 2 Feb 2017 11:05:21 +0000 (12:05 +0100)]
Merge commit '
ed9b2a5178d7a7c5a95694da3a808af327f36aff '
* commit '
ed9b2a5178d7a7c5a95694da3a808af327f36aff ':
mov: Rework the check for invalid indexes in stsc
This commit is a noop, see
3c058f570128dcfa3a68f0860e2be7f098e8d6e1 .
The proposed fix breaks seeking in multiple_stsd.mp4 (ticket #3962) and
playback of wwwq_cut.mp4 (ticket #2991).
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Carl Eugen Hoyos [Thu, 2 Feb 2017 08:45:15 +0000 (09:45 +0100)]
ffmpeg: Add a missing line break when requesting a sample.
Steinar H. Gunderson [Wed, 1 Feb 2017 16:19:18 +0000 (17:19 +0100)]
speedhq: fix out-of-bounds write
Certain alpha run lengths (for SHQ1/SHQ3/SHQ5) could be stored in
both long and short versions, and we would only accept the short version,
returning -1 (invalid code) for the others. This could cause an
out-of-bounds write on malicious input, as discovered by
Andreas Cadhalpun during fuzzing.
Fix by simply allowing both versions, leaving no invalid codes
in the alpha VLC.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Philip Langdale [Sun, 20 Nov 2016 22:32:49 +0000 (14:32 -0800)]
swscale: add P016 input support
Lucas Sandery [Wed, 1 Feb 2017 02:41:29 +0000 (13:11 +1030)]
ffplay: allow borderless playback windows
For a pure video tile effect, and enabling better integration of playback windows
into other programs. It would improve the looks in many situations and avoid ugly
hacks like this: http://stackoverflow.com/q/
31465630 /315024
Signed-off-by: Lucas Sandery <lucas-sandery@users.noreply.github.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Wed, 1 Feb 2017 19:20:07 +0000 (20:20 +0100)]
avcodec/ituh263dec: Correct timestamp recovery for B frames
Improves u263_b-frames_5.avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 1 Feb 2017 18:35:24 +0000 (19:35 +0100)]
avcodec/wmalosslessdec: remove warning message as bug is fixed
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 1 Feb 2017 18:21:01 +0000 (19:21 +0100)]
avformat/msf: support codec 1, which is 16 bit pcm le
Signed-off-by: Paul B Mahol <onemda@gmail.com>
bnnm [Mon, 30 Jan 2017 14:44:21 +0000 (15:44 +0100)]
avcodec/atrac3: Add multichannel joint stereo ATRAC3
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>
Michael Niedermayer [Wed, 1 Feb 2017 16:44:49 +0000 (17:44 +0100)]
avcodec/h263: Remove disabled and wrong code from ff_h263_loop_filter()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 1 Feb 2017 16:42:34 +0000 (17:42 +0100)]
avcodec/ituh263dec: Use correct error codes in ff_h263_decode_mb()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 1 Feb 2017 16:38:43 +0000 (17:38 +0100)]
avcodec/ituh263dec: Correct indention
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Wed, 1 Feb 2017 16:51:59 +0000 (17:51 +0100)]
lavc/error_resilience: Remove two unused variables.
Michael Niedermayer [Wed, 1 Feb 2017 16:04:52 +0000 (17:04 +0100)]
avcodec/ituh263dec: Implement B frame support with UMV
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>
Clément Bœsch [Wed, 1 Feb 2017 14:35:56 +0000 (15:35 +0100)]
Merge commit '
90bc423212396e96a02edc1118982ab7f7766a63 '
* 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>
erankor [Mon, 30 Jan 2017 10:44:24 +0000 (12:44 +0200)]
mov: add fate test for decryption with edit list
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
erankor [Thu, 12 Jan 2017 17:01:13 +0000 (19:01 +0200)]
mov: fix decryption with edit list
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>
Clément Bœsch [Wed, 1 Feb 2017 14:08:56 +0000 (15:08 +0100)]
Merge commit '
209ee680ce99035202520b900326a57f7fa0aceb '
* commit '
209ee680ce99035202520b900326a57f7fa0aceb ':
mov: Fix stsc_count comparison
This commit is a noop, see
3c058f570128dcfa3a68f0860e2be7f098e8d6e1
Merged-by: Clément Bœsch <u@pkh.me>
sumit [Tue, 31 Jan 2017 15:30:50 +0000 (21:00 +0530)]
ffmpeg_cuvid: add 420 10-bit transcode support for hwaccel cuvid
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Clément Bœsch [Wed, 1 Feb 2017 13:47:14 +0000 (14:47 +0100)]
Merge commit '
a1f6a2dfdaf9beb42ca66e49d10bfaf5905a0128 '
* 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>
Clément Bœsch [Wed, 1 Feb 2017 13:21:36 +0000 (14:21 +0100)]
Merge commit '
d639dcdae022130078c9c84b7b691c5e9694786c '
* commit '
d639dcdae022130078c9c84b7b691c5e9694786c ':
ratecontrol: Move Xvid-related functions to the place they are actually used
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 1 Feb 2017 08:31:23 +0000 (09:31 +0100)]
Merge commit '
44972e227df0f7ad5aa9004d971fb54e9dc5c849 '
* 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>
Andreas Cadhalpun [Wed, 1 Feb 2017 01:57:40 +0000 (02:57 +0100)]
boadec: remove log messages
Requested-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Tue, 31 Jan 2017 00:55:44 +0000 (01:55 +0100)]
pgssubdec: reset rle_data_len/rle_remaining_len on allocation error
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>
Michael Niedermayer [Tue, 31 Jan 2017 19:07:30 +0000 (20:07 +0100)]
Revert "Merge commit '
0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553 '"
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>
Michael Niedermayer [Wed, 1 Feb 2017 00:32:37 +0000 (01:32 +0100)]
avcodec/mjpegdec: Check for for the bitstream end in 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>
Michael Niedermayer [Tue, 31 Jan 2017 21:26:01 +0000 (22:26 +0100)]
tools/target_dec_fuzzer: Only audio uses the return value to decode packets 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>
James Almer [Tue, 31 Jan 2017 18:50:56 +0000 (15:50 -0300)]
Merge commit '
b4bb9593834460bbbe0e70823f2c503cb01ad052 '
* commit '
b4bb9593834460bbbe0e70823f2c503cb01ad052 ':
ratecontrol: Drop commented out cruft
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Jan 2017 18:36:49 +0000 (15:36 -0300)]
Merge commit '
d06dfaa5cbdd20acfd2364b16c0f4ae4ddb30a65 '
* commit '
d06dfaa5cbdd20acfd2364b16c0f4ae4ddb30a65 ':
x86: huffyuv: Use EXTERNAL_SSSE3_FAST convenience macro where appropriate
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Jan 2017 18:20:54 +0000 (15:20 -0300)]
Merge commit '
8e9cd81d291b1010c625b2766058aadf4affb537 '
* commit '
8e9cd81d291b1010c625b2766058aadf4affb537 ':
x86: cpu: Detect Conroe CPUs and their slow shuffle unit
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Jan 2017 18:15:47 +0000 (15:15 -0300)]
Merge commit '
7d7355aa92bb36ca0765c49a569a999bcb96f332 '
* commit '
7d7355aa92bb36ca0765c49a569a999bcb96f332 ':
x86: Add SSSE3_SLOW CPU flag and related convenience macros
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Jan 2017 18:08:19 +0000 (15:08 -0300)]
Merge commit '
4efab89332ea39a77145e8b15562b981d9dbde68 '
* commit '
4efab89332ea39a77145e8b15562b981d9dbde68 ':
x86: Use *_FAST/*_SLOW CPU feature detection macros where appropriate
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Jan 2017 17:59:29 +0000 (14:59 -0300)]
Merge commit '
0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553 '
* commit '
0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553 ':
x86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific code
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Jan 2017 17:56:11 +0000 (14:56 -0300)]
Merge commit '
95c1df929b92d81454656c222a35ec5f7db576b4 '
* commit '
95c1df929b92d81454656c222a35ec5f7db576b4 ':
x86: hpeldsp: Drop unused function parameters
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Jan 2017 17:53:27 +0000 (14:53 -0300)]
Merge commit '
c3e83ad3b7d75f3597f47ada2616ba4479665009 '
* commit '
c3e83ad3b7d75f3597f47ada2616ba4479665009 ':
x86: hpeldsp: Use EXTERNAL_SSE2_FAST where appropriate
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Jan 2017 17:49:29 +0000 (14:49 -0300)]
Merge commit '
1dfc3cf89d0eb026af28be46294b85d79499ffb5 '
* commit '
1dfc3cf89d0eb026af28be46294b85d79499ffb5 ':
x86: hpeldsp: Split off VP3-specific bits into a separate file
Merged-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 30 Jan 2017 00:45:30 +0000 (01:45 +0100)]
MAINTAINERS: Add myself for boadec.c
It seems ive written this thing though i cannot really remember
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Tue, 31 Jan 2017 16:35:41 +0000 (17:35 +0100)]
Merge commit '
9833a406d3d743d238e4cbee08ffcaa12e067dd2 '
* commit '
9833a406d3d743d238e4cbee08ffcaa12e067dd2 ':
examples: Properly free AVCodecContext
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 31 Jan 2017 16:32:03 +0000 (17:32 +0100)]
Merge commit '
0e0538aefc75958ded49f5d075c99a81cf6b2bbb '
* 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>
Clément Bœsch [Tue, 31 Jan 2017 16:27:46 +0000 (17:27 +0100)]
Merge commit '
5d0f85f1b2469b60d0838330aabe5353fdd9ef1d '
* commit '
5d0f85f1b2469b60d0838330aabe5353fdd9ef1d ':
libdc1394: Fill in packet data directly
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 31 Jan 2017 16:26:26 +0000 (17:26 +0100)]
Merge commit '
e344e65109f1a75ca82aff4cecec44e79197753c '
* 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>
Clément Bœsch [Tue, 31 Jan 2017 16:17:21 +0000 (17:17 +0100)]
Merge commit '
76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4 '
* commit '
76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4 ':
h264dec: handle zero-sized NAL units in get_last_needed_nal()
See
641dccc2aa5e0bf6b3c06998f9a7f24a5cf725e7
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 31 Jan 2017 16:11:24 +0000 (17:11 +0100)]
Merge commit '
1f7b4f9abc6bae94e576e710b8d10117ca3c8238 '
* 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>
Clément Bœsch [Tue, 31 Jan 2017 16:06:49 +0000 (17:06 +0100)]
Merge commit '
da917fcf5183ed249ad1285b8edd330f421376c4 '
* 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>
Clément Bœsch [Tue, 31 Jan 2017 16:02:24 +0000 (17:02 +0100)]
lavc/hevc: remove a few random spaces to reduce diff with libav
Clément Bœsch [Tue, 31 Jan 2017 15:57:18 +0000 (16:57 +0100)]
Merge commit '
1ecb63cd1c1a4ddc5efed4abbc3158b969d8c5e4 '
* 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>
Clément Bœsch [Tue, 31 Jan 2017 15:50:21 +0000 (16:50 +0100)]
Merge commit '
fca3c3b61952aacc45e9ca54d86a762946c21942 '
* 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>
Clément Bœsch [Tue, 31 Jan 2017 15:02:35 +0000 (16:02 +0100)]
Merge commit '
cc16da75c2f99d92f7a6461100f041352deb6d88 '
* 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>
Clément Bœsch [Tue, 31 Jan 2017 14:55:35 +0000 (15:55 +0100)]
Merge commit '
a92fd8a06256e71a0be87b03751ec3c2a4a8aa21 '
* commit '
a92fd8a06256e71a0be87b03751ec3c2a4a8aa21 ':
hevc: Add DC IDCT
Noop, only spacing adjusted.
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 31 Jan 2017 14:47:58 +0000 (15:47 +0100)]
Merge commit '
4f247de3b797cdc9d243d26534412f81c306e5b5 '
* 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>
Clément Bœsch [Tue, 31 Jan 2017 10:20:54 +0000 (11:20 +0100)]
Merge commit '
1bd890ad173d79e7906c5e1d06bf0a06cca4519d '
* 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>
Tobias Rapp [Thu, 5 Jan 2017 10:17:39 +0000 (11:17 +0100)]
doc/muxers: add AVI muxer documentation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Paul B Mahol [Mon, 30 Jan 2017 15:00:29 +0000 (16:00 +0100)]
avfilter/overlay: add gbrp output format
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Mon, 30 Jan 2017 10:03:21 +0000 (11:03 +0100)]
lavc/alac: Export samplerate.
Fixes ticket #6096.
Moritz Barsnick [Mon, 30 Jan 2017 20:22:41 +0000 (21:22 +0100)]
lavf/xwma: fix incorrect format specifier
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Tobias Rapp [Wed, 25 Jan 2017 08:53:03 +0000 (09:53 +0100)]
avformat/avienc: add reserve_index_space option
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>
Andreas Cadhalpun [Thu, 15 Dec 2016 01:14:45 +0000 (02:14 +0100)]
ircamdec: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Marton Balint [Mon, 30 Jan 2017 00:33:18 +0000 (01:33 +0100)]
avutil/frame: fix av_frame_copy for unknown layouts
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>
Michael Niedermayer [Mon, 30 Jan 2017 22:03:02 +0000 (23:03 +0100)]
avformat/mov: Fix integer truncation in mov_read_uuid()
Fixes Ticket6102
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sat, 6 Feb 2016 16:11:07 +0000 (17:11 +0100)]
avfilter: add threshold filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
bnnm [Mon, 30 Jan 2017 11:46:15 +0000 (12:46 +0100)]
avformat/msf: fix codec 4 (joint stereo ATRAC3) and align
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>
Tobias Rapp [Wed, 25 Jan 2017 13:57:24 +0000 (14:57 +0100)]
avformat/Makefile: fix compilation of testprogs when networking is disabled
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Clément Bœsch [Mon, 30 Jan 2017 10:57:31 +0000 (11:57 +0100)]
doc/libav-merge: add unmerged hevc commits hashes
Clément Bœsch [Mon, 30 Jan 2017 10:50:38 +0000 (11:50 +0100)]
lavc/hevcdsp: fix pretty printing mistake
"Issue" introduced in
83976e40e89655162e5394cf8915d9b6d89702d9 .
Paul B Mahol [Sun, 29 Jan 2017 09:26:16 +0000 (10:26 +0100)]
avutil/eval: add atan2 function
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 27 Jan 2017 12:58:11 +0000 (13:58 +0100)]
avformat: add SCC muxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 29 Jan 2017 17:11:09 +0000 (18:11 +0100)]
avformat/sccdec: simplify 2 sscanf calls
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Andreas Cadhalpun [Fri, 6 Jan 2017 19:31:26 +0000 (20:31 +0100)]
xvag: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Fri, 6 Jan 2017 19:31:21 +0000 (20:31 +0100)]
epafdec: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Thu, 15 Dec 2016 01:14:40 +0000 (02:14 +0100)]
genh: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Muhammad Faiz [Sun, 29 Jan 2017 22:41:49 +0000 (05:41 +0700)]
avfilter/showcqt: make minimum timeclamp option lower
high basefreq does not require high timeclamp
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Matthieu Bouron [Sat, 28 Jan 2017 12:49:52 +0000 (13:49 +0100)]
lavc/mjpegdec: consume SOS data even if the frame is discarded
Speeds up next marker search when a SOS marker is found but the frame is
discarded (which happens in avformat_find_stream_info).
Nicolas George [Sun, 29 Jan 2017 09:10:40 +0000 (10:10 +0100)]
lavfi: make ff_framequeue_skip_samples() more useful.
Instead of just updating statistics and leaving the work to the
call site, have it actually do the work.
Also: skip the samples by updating the frame data pointers
instead of moving the samples. More efficient and avoid writing
into shared frames.
Found-By: Muhammad Faiz <mfcc64@gmail.com>
Rostislav Pehlivanov [Sun, 29 Jan 2017 15:30:10 +0000 (15:30 +0000)]
doc/examples/decoder_targeted: move to tools/target_dec_fuzzer.c
Name and purpose are more appropriate there since the code isn't
an ideal example.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Michael Niedermayer [Sun, 29 Jan 2017 02:22:50 +0000 (03:22 +0100)]
doc/examples/decoder_targeted: Disable error concealment after 20 frames
This allows testing EC and non EC. Avoids spending most time in EC on
high res samples and reduces the likelyhood of hitting timeouts
Fixes: Timeout in 467/fuzz-2-ffmpeg_VIDEO_AV_CODEC_ID_H263_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 29 Jan 2017 12:29:33 +0000 (13:29 +0100)]
avfilter/vf_remap: add . at end of long description
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Andreas Cadhalpun [Thu, 26 Jan 2017 00:19:02 +0000 (01:19 +0100)]
boadec: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Thu, 15 Dec 2016 01:14:54 +0000 (02:14 +0100)]
pvfdec: prevent overflow during block alignment calculation
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Thu, 15 Dec 2016 01:14:37 +0000 (02:14 +0100)]
electronicarts: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Thu, 15 Dec 2016 01:14:31 +0000 (02:14 +0100)]
4xm: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Marijn Meijles [Fri, 27 Jan 2017 21:08:15 +0000 (22:08 +0100)]
avformat/ac3dec: Fix to prevent runaway ac3 detection by looking at the actual frame rather than the first detected frame.
When detecting a swapped AC3 marker the data of the frame is swapped. However, in subsequent frames the data swapped is taken from the first frame rather than the current frame.
Signed-off-by: Marijn Meijles <marijn@bitpit.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul Arzelier [Sat, 28 Jan 2017 16:25:27 +0000 (17:25 +0100)]
avformat: Ignore ID3v2 tags if other tags are present e.g. vorbis
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sat, 28 Jan 2017 16:44:59 +0000 (13:44 -0300)]
avformat/matroskaenc: don't reserve more bytes than needed for the Colour master size
Found-by: Aaron Colwell <acolwell@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Sat, 28 Jan 2017 16:23:31 +0000 (17:23 +0100)]
avformat/sccdec: attempt to fix valgrind issue
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Chris Moeller [Fri, 27 Jan 2017 21:20:31 +0000 (13:20 -0800)]
avformat: fix ID3v2 parser for v2.2 comment frames
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Aaron Colwell [Fri, 27 Jan 2017 17:33:29 +0000 (09:33 -0800)]
mov: Fix spherical metadata_source parsing
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sat, 21 Jan 2017 22:01:50 +0000 (23:01 +0100)]
avfilter/vf_gblur: Increase supported pixel count from 31bit to 32bit in filter_postscale()
Fixes CID1396252
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Sasi Inguva [Thu, 26 Jan 2017 00:41:44 +0000 (16:41 -0800)]
ffmpeg.c: Add output file index and stream index to vstats file.
Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Sasi Inguva [Thu, 26 Jan 2017 19:26:46 +0000 (11:26 -0800)]
lavf/matroskaenc.c: Free dyn bufs in mkv_free. Fixes memory leaks when muxing fails.
Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 25 Jan 2017 21:28:48 +0000 (22:28 +0100)]
fate: add SCC test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 27 Jan 2017 12:37:00 +0000 (13:37 +0100)]
avfilter/avf_showspectrum: fix 2 possible crashes
Make sure no division by zero is done.
Make sure there are actually samples available.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 27 Jan 2017 11:13:42 +0000 (12:13 +0100)]
doc/filters: mention recently added option
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Fri, 27 Jan 2017 07:31:07 +0000 (08:31 +0100)]
lavf/img2dec: Reduce the probe score for incomplete jpgs.
Ensures that probing doesn't finish prematurely for small files.
Michael Niedermayer [Thu, 26 Jan 2017 23:14:02 +0000 (00:14 +0100)]
avcodec/h264dec: Clear ref_count on slice header processing failure
Fixes using freed memory
Introduced in
744801989099df26e90b00062c645969c5347533
Fixes: 471/fuzz-1-ffmpeg_VIDEO_AV_CODEC_ID_H264_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Thu, 26 Jan 2017 22:28:09 +0000 (19:28 -0300)]
avformat/matroskadec: ProjectionPrivate is optional on Equirectangular projections
This reflects a recent change to the spec draft.
Signed-off-by: James Almer <jamrial@gmail.com>