ffmpeg.git
2 years agoavcodec/h263: Remove disabled and wrong code from ff_h263_loop_filter()
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>
2 years agoavcodec/ituh263dec: Use correct error codes in ff_h263_decode_mb()
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>
2 years agoavcodec/ituh263dec: Correct indention
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>
2 years agolavc/error_resilience: Remove two unused variables.
Carl Eugen Hoyos [Wed, 1 Feb 2017 16:51:59 +0000 (17:51 +0100)]
lavc/error_resilience: Remove two unused variables.

2 years agoavcodec/ituh263dec: Implement B frame support with UMV
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>
2 years agoMerge commit '90bc423212396e96a02edc1118982ab7f7766a63'
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>
2 years agomov: add fate test for decryption with edit list
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>
2 years agomov: fix decryption with edit list
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>
2 years agoMerge commit '209ee680ce99035202520b900326a57f7fa0aceb'
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>
2 years agoffmpeg_cuvid: add 420 10-bit transcode support for hwaccel cuvid
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>
2 years agoMerge commit 'a1f6a2dfdaf9beb42ca66e49d10bfaf5905a0128'
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>
2 years agoMerge commit 'd639dcdae022130078c9c84b7b691c5e9694786c'
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>
2 years agoMerge commit '44972e227df0f7ad5aa9004d971fb54e9dc5c849'
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>
2 years agoboadec: remove log messages
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>
2 years agopgssubdec: reset rle_data_len/rle_remaining_len on allocation error
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>
2 years agoRevert "Merge commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553'"
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>
2 years agoavcodec/mjpegdec: Check for for the bitstream end in mjpeg_decode_scan_progressive_ac()
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>
2 years agotools/target_dec_fuzzer: Only audio uses the return value to decode packets in pieces...
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>
2 years agoMerge commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052'
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>
2 years agoMerge commit 'd06dfaa5cbdd20acfd2364b16c0f4ae4ddb30a65'
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>
2 years agoMerge commit '8e9cd81d291b1010c625b2766058aadf4affb537'
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>
2 years agoMerge commit '7d7355aa92bb36ca0765c49a569a999bcb96f332'
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>
2 years agoMerge commit '4efab89332ea39a77145e8b15562b981d9dbde68'
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>
2 years agoMerge commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553'
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>
2 years agoMerge commit '95c1df929b92d81454656c222a35ec5f7db576b4'
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>
2 years agoMerge commit 'c3e83ad3b7d75f3597f47ada2616ba4479665009'
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>
2 years agoMerge commit '1dfc3cf89d0eb026af28be46294b85d79499ffb5'
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>
2 years agoMAINTAINERS: Add myself for boadec.c
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>
2 years agoMerge commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2'
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>
2 years agoMerge commit '0e0538aefc75958ded49f5d075c99a81cf6b2bbb'
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>
2 years agoMerge commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d'
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>
2 years agoMerge commit 'e344e65109f1a75ca82aff4cecec44e79197753c'
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>
2 years agoMerge commit '76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4'
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>
2 years agoMerge commit '1f7b4f9abc6bae94e576e710b8d10117ca3c8238'
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>
2 years agoMerge commit 'da917fcf5183ed249ad1285b8edd330f421376c4'
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>
2 years agolavc/hevc: remove a few random spaces to reduce diff with libav
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

2 years agoMerge commit '1ecb63cd1c1a4ddc5efed4abbc3158b969d8c5e4'
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>
2 years agoMerge commit 'fca3c3b61952aacc45e9ca54d86a762946c21942'
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>
2 years agoMerge commit 'cc16da75c2f99d92f7a6461100f041352deb6d88'
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>
2 years agoMerge commit 'a92fd8a06256e71a0be87b03751ec3c2a4a8aa21'
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>
2 years agoMerge commit '4f247de3b797cdc9d243d26534412f81c306e5b5'
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>
2 years agoMerge commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d'
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>
2 years agodoc/muxers: add AVI muxer documentation
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>
2 years agoavfilter/overlay: add gbrp output format
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>
2 years agolavc/alac: Export samplerate.
Carl Eugen Hoyos [Mon, 30 Jan 2017 10:03:21 +0000 (11:03 +0100)]
lavc/alac: Export samplerate.

Fixes ticket #6096.

2 years agolavf/xwma: fix incorrect format specifier
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>
2 years agoavformat/avienc: add reserve_index_space option
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>
2 years agoircamdec: prevent overflow during block alignment calculation
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>
2 years agoavutil/frame: fix av_frame_copy for unknown layouts
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>
2 years agoavformat/mov: Fix integer truncation in mov_read_uuid()
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>
2 years agoavfilter: add threshold filter
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>
2 years agoavformat/msf: fix codec 4 (joint stereo ATRAC3) and align
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>
2 years agoavformat/Makefile: fix compilation of testprogs when networking is disabled
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>
2 years agodoc/libav-merge: add unmerged hevc commits hashes
Clément Bœsch [Mon, 30 Jan 2017 10:57:31 +0000 (11:57 +0100)]
doc/libav-merge: add unmerged hevc commits hashes

2 years agolavc/hevcdsp: fix pretty printing mistake
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.

2 years agoavutil/eval: add atan2 function
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>
2 years agoavformat: add SCC muxer
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>
2 years agoavformat/sccdec: simplify 2 sscanf calls
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>
2 years agoxvag: prevent overflow during block alignment calculation
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>
2 years agoepafdec: prevent overflow during block alignment calculation
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>
2 years agogenh: prevent overflow during block alignment calculation
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>
2 years agoavfilter/showcqt: make minimum timeclamp option lower
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>
2 years agolavc/mjpegdec: consume SOS data even if the frame is discarded
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).

2 years agolavfi: make ff_framequeue_skip_samples() more useful.
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>
2 years agodoc/examples/decoder_targeted: move to tools/target_dec_fuzzer.c
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>
2 years agodoc/examples/decoder_targeted: Disable error concealment after 20 frames
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>
2 years agoavfilter/vf_remap: add . at end of long description
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>
2 years agoboadec: prevent overflow during block alignment calculation
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>
2 years agopvfdec: prevent overflow during block alignment calculation
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>
2 years agoelectronicarts: prevent overflow during block alignment calculation
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>
2 years ago4xm: prevent overflow during block alignment calculation
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>
2 years agoavformat/ac3dec: Fix to prevent runaway ac3 detection by looking at the actual frame...
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>
2 years agoavformat: Ignore ID3v2 tags if other tags are present e.g. vorbis
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>
2 years agoavformat/matroskaenc: don't reserve more bytes than needed for the Colour master...
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>
2 years agoavformat/sccdec: attempt to fix valgrind issue
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>
2 years agoavformat: fix ID3v2 parser for v2.2 comment frames
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>
2 years agomov: Fix spherical metadata_source parsing
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>
2 years agoavfilter/vf_gblur: Increase supported pixel count from 31bit to 32bit in filter_posts...
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>
2 years agoffmpeg.c: Add output file index and stream index to vstats file.
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>
2 years agolavf/matroskaenc.c: Free dyn bufs in mkv_free. Fixes memory leaks when muxing fails.
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>
2 years agofate: add SCC test
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>
2 years agoavfilter/avf_showspectrum: fix 2 possible crashes
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>
2 years agodoc/filters: mention recently added option
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>
2 years agolavf/img2dec: Reduce the probe score for incomplete jpgs.
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.

2 years agoavcodec/h264dec: Clear ref_count on slice header processing failure
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>
2 years agoavformat/matroskadec: ProjectionPrivate is optional on Equirectangular projections
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>
2 years agotcp: set socket buffer sizes before listen/connect/accept
Joel Cunningham [Mon, 9 Jan 2017 20:54:47 +0000 (14:54 -0600)]
tcp: set socket buffer sizes before listen/connect/accept

From e24d95c0e06a878d401ee34fd6742fcaddeeb95f Mon Sep 17 00:00:00 2001
From: Joel Cunningham <joel.cunningham@me.com>
Date: Mon, 9 Jan 2017 13:37:51 -0600
Subject: [PATCH] tcp: set socket buffer sizes before listen/connect/accept

Attempting to set SO_RCVBUF and SO_SNDBUF on TCP sockets after connection
establishment is incorrect and some stacks ignore the set call on the socket at
this point.  This has been observed on MacOS/iOS.  Windows 7 has some peculiar
behavior where setting SO_RCVBUF after applies only if the buffer is increasing
from the default while decreases are ignored.  This is possibly how the incorrect
usage has gone unnoticed

Unix Network Programming Vol. 1: The Sockets Networking API (3rd edition, seciton 7.5):

"When setting the size of the TCP socket receive buffer, the ordering of the
function calls is important.  This is because of TCP's window scale option,
which is exchanged with the peer on SYN segments when the connection is
established. For a client, this means the SO_RCVBUF socket option must be
set before calling connect.  For a server, this means the socket option must
be set for the listening socket before calling listen.  Setting this option
for the connected socket will have no effect whatsoever on the possible window
scale option because accept does not return with the connected socket until
TCP's three-way handshake is complete.  This is why the option must be set on
the listening socket. (The sizes of the socket buffers are always inherited from
the listening socket by the newly created connected socket)"

Signed-off-by: Joel Cunningham <joel.cunningham@me.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter: add abitscope multimedia filter
Paul B Mahol [Thu, 5 May 2016 10:15:39 +0000 (12:15 +0200)]
avfilter: add abitscope multimedia filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavformat/flacdec: Check avio_read result when reading flac block header.
Frank Liberato [Tue, 24 Jan 2017 18:58:17 +0000 (10:58 -0800)]
avformat/flacdec: Check avio_read result when reading flac block header.

Return AVERROR_INVALIDDATA if all four bytes aren't present.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffmpeg_opt.c: Introduce a -vstats_version option and document the existing -vstats...
Sasi Inguva [Tue, 24 Jan 2017 16:23:54 +0000 (08:23 -0800)]
ffmpeg_opt.c: Introduce a -vstats_version option and document the existing -vstats format.

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodecc/ccaption_dec: remove extra word from long codec description
Paul B Mahol [Wed, 25 Jan 2017 10:00:13 +0000 (11:00 +0100)]
avcodecc/ccaption_dec: remove extra word from long codec description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavformat: add Scenarist Closed Captions demuxer
Paul B Mahol [Tue, 24 Jan 2017 15:34:29 +0000 (16:34 +0100)]
avformat: add Scenarist Closed Captions demuxer

Fixes #4767.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavformat: add Sample Dump eXchange demuxer
Paul B Mahol [Sat, 21 Jan 2017 11:29:44 +0000 (12:29 +0100)]
avformat: add Sample Dump eXchange demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agolavf/mov: Unscramble dref debug output.
Carl Eugen Hoyos [Wed, 25 Jan 2017 10:49:04 +0000 (11:49 +0100)]
lavf/mov: Unscramble dref debug output.

2 years agoisom: map xalg and avlg to h264, fixes ticket #6099
compn [Wed, 25 Jan 2017 04:46:38 +0000 (23:46 -0500)]
isom: map xalg and avlg to h264, fixes ticket #6099

2 years agoavcodec/utils: correct align value for interplay
Michael Niedermayer [Tue, 24 Jan 2017 23:20:19 +0000 (00:20 +0100)]
avcodec/utils: correct align value for interplay

Fixes out of array access
Fixes: 452/fuzz-1-ffmpeg_VIDEO_AV_CODEC_ID_INTERPLAY_VIDEO_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoCosmetics: Reindent after last commit.
Carl Eugen Hoyos [Tue, 24 Jan 2017 23:55:36 +0000 (00:55 +0100)]
Cosmetics: Reindent after last commit.

2 years agolavd/v4l2: Avoid setting frame_size to a negative value.
Carl Eugen Hoyos [Sat, 10 Dec 2016 15:43:00 +0000 (16:43 +0100)]
lavd/v4l2: Avoid setting frame_size to a negative value.

2 years agolavf/rtmpproto: Make bytes_read variables 64bit.
Carl Eugen Hoyos [Sat, 14 Jan 2017 18:17:09 +0000 (19:17 +0100)]
lavf/rtmpproto: Make bytes_read variables 64bit.

When bytes_read overflowed, last_bytes_read did not yet overflow
and no bytes-read report was created leading to a timeout.

Analyzed-by: Thomas Bernhard
Fixes ticket #5836.

2 years agoavfilter/formats: do not allow unknown layouts in ff_parse_channel_layout if nret...
Marton Balint [Mon, 26 Dec 2016 01:03:37 +0000 (02:03 +0100)]
avfilter/formats: do not allow unknown layouts in ff_parse_channel_layout if nret is not set

Current code returned the number of channels as channel layout in that case,
and if nret is not set then unknown layouts are typically not supported.

Also use the common parsing code. Use a temporary workaround to parse an
unknown channel layout such as '13c', after a 1 year grace period only '13C'
will work.

Signed-off-by: Marton Balint <cus@passwd.hu>