ffmpeg.git
2 years agolavc/mjpegenc_common: Remove an unused variable.
Carl Eugen Hoyos [Fri, 10 Feb 2017 11:34:36 +0000 (12:34 +0100)]
lavc/mjpegenc_common: Remove an unused variable.

2 years agolavf/mov.c: Avoid heap allocation wraps in mov_read_{senc,saiz}()
Matt Wolenetz [Wed, 14 Dec 2016 23:27:49 +0000 (15:27 -0800)]
lavf/mov.c: Avoid heap allocation wraps in mov_read_{senc,saiz}()

Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643952 (senc,saiz portions)

Signed-off-by: Matt Wolenetz <wolenetz@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavf/mov.c: Avoid OOB in mov_read_udta_string()
Matt Wolenetz [Wed, 8 Feb 2017 23:40:46 +0000 (15:40 -0800)]
lavf/mov.c: Avoid OOB in mov_read_udta_string()

Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643952 (udta_string portion)

Signed-off-by: Matt Wolenetz <wolenetz@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mjpegenc: Simplify by moving assert into ff_mjpeg_encode_huffman_close()
Michael Niedermayer [Thu, 9 Feb 2017 23:18:34 +0000 (00:18 +0100)]
avcodec/mjpegenc: Simplify by moving assert into ff_mjpeg_encode_huffman_close()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mjpegenc: Bypass the 2 pass encoding when optimal tables are not requested
Michael Niedermayer [Thu, 9 Feb 2017 22:24:15 +0000 (23:24 +0100)]
avcodec/mjpegenc: Bypass the 2 pass encoding when optimal tables are not requested

This limits the bugs, speedloss and extra memory allocation to the case when
optimal tables are needed.
Fixes regressions with slice multi-threading

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mjpegenc: Revert some differences in ff_mjpeg_encode_mb() relative to pre...
Michael Niedermayer [Thu, 9 Feb 2017 22:07:11 +0000 (23:07 +0100)]
avcodec/mjpegenc: Revert some differences in ff_mjpeg_encode_mb() relative to pre optimal huffman

The changes are not needed anymore and the return code was never used

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mjpegenc_huffman: remove unneeded header include
Michael Niedermayer [Thu, 9 Feb 2017 22:03:57 +0000 (23:03 +0100)]
avcodec/mjpegenc_huffman: remove unneeded header include

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/tests/mjpegenc_huffman: Remove static in main() table
Michael Niedermayer [Thu, 9 Feb 2017 21:56:19 +0000 (22:56 +0100)]
avcodec/tests/mjpegenc_huffman: Remove static in main() table

Avoids false positives when greping for non constant statics

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mjpegenc: Drop i_tex misuse, set itex/header bits correctly, fix 2pass encoding
Michael Niedermayer [Thu, 9 Feb 2017 21:10:43 +0000 (22:10 +0100)]
avcodec/mjpegenc: Drop i_tex misuse, set itex/header bits correctly, fix 2pass encoding

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mjpegenc: Remove non functional huffman reallocation and error handling
Michael Niedermayer [Thu, 9 Feb 2017 20:11:51 +0000 (21:11 +0100)]
avcodec/mjpegenc: Remove non functional huffman reallocation and error handling

If this is wanted iam not against it but it must be designed to work with all cases
like slice threads, and a single growing buffer does not work very well with slices.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agotests/mjpegenc_huffman: align static tables
Rostislav Pehlivanov [Thu, 9 Feb 2017 03:08:50 +0000 (03:08 +0000)]
tests/mjpegenc_huffman: align static tables

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agomjpegenc: use s->avctx as a context for av_log rather than NULL
Rostislav Pehlivanov [Thu, 9 Feb 2017 03:01:58 +0000 (03:01 +0000)]
mjpegenc: use s->avctx as a context for av_log rather than NULL

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agotests/mjpegenc_huffman: replace assert() with av_assert0()
Rostislav Pehlivanov [Thu, 9 Feb 2017 02:59:22 +0000 (02:59 +0000)]
tests/mjpegenc_huffman: replace assert() with av_assert0()

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agomjpegenc_common: add missing ff_ prefix to init_uni_ac_vlc
Rostislav Pehlivanov [Thu, 9 Feb 2017 02:56:13 +0000 (02:56 +0000)]
mjpegenc_common: add missing ff_ prefix to init_uni_ac_vlc

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agoffplay: change keyboard volume control to logarithmic
Marton Balint [Sun, 5 Feb 2017 00:16:29 +0000 (01:16 +0100)]
ffplay: change keyboard volume control to logarithmic

The command line parameter remains linear.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agovaapi_encode: Add VP8 support
Mark Thompson [Tue, 29 Nov 2016 20:38:29 +0000 (20:38 +0000)]
vaapi_encode: Add VP8 support

Fixes ticket #6116.

(cherry picked from commit ca62236a89f47bd871eaf69d8d9e837c93c55a6c)

2 years agovaapi_encode: Pass framerate parameters to driver
Mark Thompson [Tue, 29 Nov 2016 22:12:46 +0000 (22:12 +0000)]
vaapi_encode: Pass framerate parameters to driver

Only do this when building for a recent VAAPI version - initial
driver implementations were confused about the interpretation of the
framerate field, but hopefully this will be consistent everywhere
once 0.40.0 is released.

(cherry picked from commit ff35aa8ca4069bf1543adeec4c28e51e4a012eee)

2 years agovaapi_h264: Enable VBR mode
Mark Thompson [Sun, 29 Jan 2017 14:12:20 +0000 (14:12 +0000)]
vaapi_h264: Enable VBR mode

Default to using VBR when a target bitrate is set, unless the max rate
is also set and matches the target.  Changes to the Intel driver mean
that min_qp is also respected in this case, so set a codec default to
unset the value rather than using the current default inherited from
the MPEG-4 part 2 encoder.

(cherry picked from commit eddfb57210298a0a94472794485400a3a6c76196)

2 years agovaapi_encode: Support VBR mode
Mark Thompson [Sun, 29 Jan 2017 14:11:03 +0000 (14:11 +0000)]
vaapi_encode: Support VBR mode

This includes a backward-compatibility hack to choose CBR anyway on
old drivers which have no CBR support, so that existing programs will
continue to work their options now map to VBR.

(cherry picked from commit f033ba470fbab1ff6838666d4d86411effa97b27)

2 years agovaapi_encode: Add MPEG-2 support
Mark Thompson [Mon, 9 Jan 2017 19:17:37 +0000 (19:17 +0000)]
vaapi_encode: Add MPEG-2 support

(cherry picked from commit ca6ae3b77a7e6600e517723b90e57527a47809de)

2 years agovaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_frames
Mark Thompson [Wed, 4 Jan 2017 23:05:10 +0000 (23:05 +0000)]
vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_frames

Before this change, it was possible to overflow pic_order_cnt_lsb and
generate a stream with invalid POC numbering.  This makes sure that
the field is large enough that a single IDR B* P sequence uses fewer
than half the available POC lsb values.

(cherry picked from commit 89725a8512721fffd190021ded2d3f5b42e20e2a)

2 years agovaapi_encode: Support forcing IDR frames via AVFrame.pict_type
Mark Thompson [Mon, 12 Dec 2016 21:25:28 +0000 (21:25 +0000)]
vaapi_encode: Support forcing IDR frames via AVFrame.pict_type

(cherry picked from commit a3c3a5eac20a51d402c332cdf5220fff40a7943f)

2 years agovaapi_encode: Fix GOP sizing
Mark Thompson [Wed, 4 Jan 2017 23:17:23 +0000 (23:17 +0000)]
vaapi_encode: Fix GOP sizing

This change makes the configured GOP size be respected exactly -
previously the value could be exceeded slightly due to flaws in the
frame type selection logic.

(cherry picked from commit 37fab0661a760b2a9d727939d72e629acee1a6ef)

2 years agovaapi_h265: Fix CFR mode with framerate set in AVCodecContext
Mark Thompson [Tue, 29 Nov 2016 22:13:58 +0000 (22:13 +0000)]
vaapi_h265: Fix CFR mode with framerate set in AVCodecContext

Same issue as 17a0f9481cf07af0feb3838ca315b970117e8000.

(cherry picked from commit 7d81698b89172d2dcf1b78d4b42ba86262360559)

2 years agovaapi_h265: Add main 10 encode support
Mark Thompson [Fri, 30 Sep 2016 10:48:43 +0000 (11:48 +0100)]
vaapi_h265: Add main 10 encode support

(cherry picked from commit 5a5df90d9c05d86d9b0564b8b40b6d64a324df5e)
(cherry picked from commit d08e02d929ff8be5f56bb1da0e439bf1ae557552)

2 years agoavcodec/h264_slice: Clear ref_counts on redundant slices
Michael Niedermayer [Wed, 8 Feb 2017 16:55:41 +0000 (17:55 +0100)]
avcodec/h264_slice: Clear ref_counts on redundant slices

Fixes reading freed memory
Fixes: 568/clusterfuzz-testcase-6107186067406848

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 agodoc/encoders: fix broken build with 884506dfe2e
Ricardo Constantino [Wed, 8 Feb 2017 15:53:20 +0000 (15:53 +0000)]
doc/encoders: fix broken build with 884506dfe2e

2 years agoImplement optimal huffman encoding for (M)JPEG.
Jerry Jiang [Thu, 2 Feb 2017 07:23:04 +0000 (23:23 -0800)]
Implement optimal huffman encoding for (M)JPEG.

> seems to break
> make fate-vsynth1-mjpeg-444

Fixed.

2 years agolavf/mov.c: Avoid heap allocation wrap in mov_read_uuid
Matt Wolenetz [Wed, 14 Dec 2016 23:26:19 +0000 (15:26 -0800)]
lavf/mov.c: Avoid heap allocation wrap in mov_read_uuid

Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643951

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Check value reduced as the code does not support values beyond INT_MAX
Also the check is moved to a more common place and before integer truncation

2 years agolavf/mov.c: Avoid heap allocation wrap in mov_read_hdlr
Matt Wolenetz [Wed, 14 Dec 2016 23:24:42 +0000 (15:24 -0800)]
lavf/mov.c: Avoid heap allocation wrap in mov_read_hdlr

Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643950

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Check value reduced as the code does not support larger lengths

2 years agolibavcodec/cinepak.c: fix a wrong (inverted) misleading comment
Rl [Sun, 29 Jan 2017 17:28:25 +0000 (18:28 +0100)]
libavcodec/cinepak.c: fix a wrong (inverted) misleading comment

Make the comment message understandable and correct.

2 years agoavcodec: Mark some codecs with threadsafe init as such
Derek Buitenhuis [Tue, 7 Feb 2017 16:36:38 +0000 (16:36 +0000)]
avcodec: Mark some codecs with threadsafe init as such

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/vf_scale: Fix chroma positioning for 4:2:0 pixel format
Maksym Veremeyenko [Mon, 6 Feb 2017 15:03:17 +0000 (17:03 +0200)]
avfilter/vf_scale: Fix chroma positioning for 4:2:0 pixel format

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/pictordec: Fix logic error
Michael Niedermayer [Tue, 7 Feb 2017 14:49:09 +0000 (15:49 +0100)]
avcodec/pictordec: Fix logic error

Fixes: 559/clusterfuzz-testcase-6424225917173760

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 agomatroska: demux BluRay text subtitles
Petri Hintukainen [Mon, 6 Feb 2017 07:41:03 +0000 (09:41 +0200)]
matroska: demux BluRay text subtitles

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodoc/filters: extend midequalizer description
Paul B Mahol [Tue, 7 Feb 2017 09:09:18 +0000 (10:09 +0100)]
doc/filters: extend midequalizer description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavformat/hlsenc: add hls_flag option to write segments to temporary file until complete
Aman Gupta [Tue, 7 Feb 2017 03:58:43 +0000 (11:58 +0800)]
avformat/hlsenc: add hls_flag option to write segments to temporary file until complete

Adds a `-hls_flags +temp_file` which will write segment data to
filename.tmp, and then rename to filename when the segment is complete.

This patch is similar in spirit to one used in Plex's ffmpeg fork, and
allows a transcoding webserver to ensure incomplete segment files are
never served up accidentally.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Bodecs Bela <bodecsb@vivanet.hu>
Signed-off-by: Aman Gupta <aman@tmm1.net>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2 years agoconfigure: use dashes instead of slashes in lib.exe invocation
Hendrik Leppkes [Mon, 6 Feb 2017 18:45:54 +0000 (19:45 +0100)]
configure: use dashes instead of slashes in lib.exe invocation

This avoids issues with wrong parameter translation by msys on some systems,
and the Windows SDK tools accept both forms equally.

2 years agoavcodec/movtextdec: Fix decode_styl() cleanup
Michael Niedermayer [Mon, 6 Feb 2017 10:17:10 +0000 (11:17 +0100)]
avcodec/movtextdec: Fix decode_styl() cleanup

Fixes: null pointer dereference
Fixes: 555/clusterfuzz-testcase-5986646595993600

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_midequalizer: Remove duplicate include
Michael Niedermayer [Mon, 6 Feb 2017 00:53:56 +0000 (01:53 +0100)]
avfilter/vf_midequalizer: Remove duplicate include

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavf/matroskadec: fix is_keyframe for early Blocks
Chris Cunningham [Fri, 3 Feb 2017 22:42:44 +0000 (14:42 -0800)]
lavf/matroskadec: fix is_keyframe for early Blocks

Blocks are marked as key frames whenever the "reference" field is
zero. This breaks for non-keyframe Blocks with a reference timestamp
of zero.

The likelihood of reference timestamp being zero is increased by a
longstanding bug in muxing that encodes reference timestamp as the
absolute time of the referenced frame (rather than relative to the
current Block timestamp, as described in MKV spec).

Now using INT64_MIN to denote "no reference".

Reported to chromium at http://crbug.com/497889 (contains sample)

2 years agoffmpeg: Remove redundant null check
Michael Niedermayer [Sun, 5 Feb 2017 23:00:56 +0000 (00:00 +0100)]
ffmpeg: Remove redundant null check

Fixes CID1396245

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/pthread_frame: Check av_packet_ref() for failure
Michael Niedermayer [Sun, 5 Feb 2017 14:09:52 +0000 (15:09 +0100)]
avcodec/pthread_frame: Check av_packet_ref() for failure

Fixes CID1396242

2 years agoavfilter/af_pan: fix null pointer dereference on empty token
Marton Balint [Sun, 5 Feb 2017 01:25:04 +0000 (02:25 +0100)]
avfilter/af_pan: fix null pointer dereference on empty token

Fixes Coverity CID 1396254.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agovf_scale_vaapi: Add missing return value checks
Mark Thompson [Mon, 9 Jan 2017 00:59:50 +0000 (00:59 +0000)]
vf_scale_vaapi: Add missing return value checks

Fixes CID 1374119.

2 years agoffmpeg_vaapi: Always set hwaccel_ctx, so it gets properly cleaned up on error
Mark Thompson [Sun, 22 Jan 2017 18:25:53 +0000 (18:25 +0000)]
ffmpeg_vaapi: Always set hwaccel_ctx, so it gets properly cleaned up on error

Fixes CID 1398954.

2 years agoRevert "avutil/hwcontext_vaapi: fix SEGV in vaTerminate when vaInitialize fails"
Mark Thompson [Sun, 5 Feb 2017 14:58:06 +0000 (14:58 +0000)]
Revert "avutil/hwcontext_vaapi: fix SEGV in vaTerminate when vaInitialize fails"

The original code is correctly following the API - vaTerminate() must
be called to free the resources of a VADisplay after it is created by
any of the vaGetDisplay*() calls; it is not necessary to have
successfully called vaInitialize() on it.  The segfaults which
prompted this change must therefore be bugs in libva or the driver it
loads.

This reverts commit 3606602f1137552ea54f2c259eb140c1e3c026d4.

2 years agoffmpeg_vaapi: Unreference global device before setting it
Mark Thompson [Sun, 22 Jan 2017 18:48:51 +0000 (18:48 +0000)]
ffmpeg_vaapi: Unreference global device before setting it

This currently leaks if multiple device options are specified on the
command line.

2 years agoavfilter/ebur128: fix relative threshold calculation for multiple contexts
Marton Balint [Wed, 25 Jan 2017 00:44:31 +0000 (01:44 +0100)]
avfilter/ebur128: fix relative threshold calculation for multiple contexts

This reworks the code a bit and also disallows NULL contexts.

Fixes Coverity CID 13962731396279.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoavfilter/ebur128: do not allow null ebur128 context in ff_ebur128_relative_threshold
Marton Balint [Wed, 25 Jan 2017 00:06:42 +0000 (01:06 +0100)]
avfilter/ebur128: do not allow null ebur128 context in ff_ebur128_relative_threshold

The user should supply a proper context.

Fixes Coverity CID 1396246.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agodoc/muxers: remove confusing example for segment muxer option clocktime_wrap_duration
Marton Balint [Fri, 27 Jan 2017 00:56:30 +0000 (01:56 +0100)]
doc/muxers: remove confusing example for segment muxer option clocktime_wrap_duration

Detecting a leap second depends on a lot of things, segment time, segment
offset, system leap second implementation, the removed part is a huge
simplification which can be misleading, so it is best to remove it.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoavformat/segment: remove last_cut check when detecting a new segment
Marton Balint [Thu, 26 Jan 2017 02:04:57 +0000 (03:04 +0100)]
avformat/segment: remove last_cut check when detecting a new segment

Not starting a new segment if the elapsed microsecs since the start of the day
equals the the elapsed microsecs since the start of the day at the time of the
last cut seems plain wrong to me, Deti do you remember the original reason
behind this check?

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoffplay: fix borderless mode on Windows
Marton Balint [Fri, 3 Feb 2017 00:31:30 +0000 (01:31 +0100)]
ffplay: fix borderless mode on Windows

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoavfilter: add midequalizer filter
Paul B Mahol [Thu, 2 Feb 2017 12:10:37 +0000 (13:10 +0100)]
avfilter: add midequalizer filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavcodec/pngdec: Check trns more completely
Michael Niedermayer [Sat, 4 Feb 2017 11:24:14 +0000 (12:24 +0100)]
avcodec/pngdec: Check trns more completely

Fixes out of array access
Fixes: 546/clusterfuzz-testcase-4809433909559296

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 agoopus_rc: rename total_bits_used to total_bits and #define some constants
Rostislav Pehlivanov [Wed, 1 Feb 2017 03:13:04 +0000 (03:13 +0000)]
opus_rc: rename total_bits_used to total_bits and #define some constants

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agoconfigure: instruct MSVC 2015 to properly process UTF-8 string literals
Hendrik Leppkes [Fri, 3 Feb 2017 08:37:53 +0000 (09:37 +0100)]
configure: instruct MSVC 2015 to properly process UTF-8 string literals

Without the /UTF-8 switch, the MSVC compiler treats all files as in the
system codepage, instead of in UTF-8, which causes UTF-8 string literals
to be interpreted wrong.

This switch was only introduced in VS2015 Update 2, and any earlier
versions do not have an equivalent solution.

Fixes fate-sub-scc on MSVC 2015+

2 years agoconfigure: add nologo switch to invocation of lib.exe
Hendrik Leppkes [Fri, 3 Feb 2017 08:36:55 +0000 (09:36 +0100)]
configure: add nologo switch to invocation of lib.exe

This suppresses the startup banner, which is consistent with all other calls
to the Windows SDK binaries.

2 years agoavcodec/interplayvideo: Move parameter change check up
Michael Niedermayer [Sat, 4 Feb 2017 01:45:02 +0000 (02:45 +0100)]
avcodec/interplayvideo: Move parameter change check up

Fixes out of array read
Fixes: 544/clusterfuzz-testcase-5936536407244800.f8bd9b24_8ba77916_70c2c7be_3df6a2ea_96cd9f14

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/flacdsp: Avoid undefined operations in non debug builds
Michael Niedermayer [Thu, 15 Dec 2016 00:32:18 +0000 (01:32 +0100)]
avcodec/flacdsp: Avoid undefined operations in non debug builds

This fixes ubsan warnings in non debug builds by using unsigned operations

in debug builds the correct signed operations are retained so that overflows
(which should not occur in valid files and may indicate problems in the DSP code
or decoder) can be detected.

Alternatively they can be changed to unsigned unconditionally, then its
not possible though to detect overflows easily if someone wants to test
the DSP code for overflows.

The 2nd alternative would be to leave the code as it is and accept that
there are undefined operations in the DSP code and that ubsan output is
full of them in some cases.

Similar changes would be needed in some other DSP routines

Suggested-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/flacdec: Check for invalid vlcs
Michael Niedermayer [Fri, 9 Dec 2016 15:29:35 +0000 (16:29 +0100)]
avcodec/flacdec: Check for invalid vlcs

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodoc: clarify option on looping infinitely in movie filter
Werner Robitza [Thu, 2 Feb 2017 18:39:24 +0000 (19:39 +0100)]
doc: clarify option on looping infinitely in movie filter

Clarify that setting loop=0 is required to make the stream loop infinitely, rather than saying that a value "less than 1" is needed.

Signed-off-by: Lou Logan <lou@lrcd.com>
2 years agoavfilter/vf_unsharp: Free out AVFrame on error
Michael Niedermayer [Fri, 3 Feb 2017 18:37:18 +0000 (19:37 +0100)]
avfilter/vf_unsharp: Free out AVFrame on error

Fixes memleak
Fixes part of CID1197065

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/vf_perspective: Free out AVFrame on error
Michael Niedermayer [Fri, 3 Feb 2017 18:37:18 +0000 (19:37 +0100)]
avfilter/vf_perspective: Free out AVFrame on error

Fixes memleak
Fixes part of CID1197065

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/vf_fieldhint: Free out AVFrame on error
Michael Niedermayer [Fri, 3 Feb 2017 18:37:18 +0000 (19:37 +0100)]
avfilter/vf_fieldhint: Free out AVFrame on error

Fixes memleak
Fixes part of CID1197065

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/vf_deshake: Free out AVFrame on error
Michael Niedermayer [Fri, 3 Feb 2017 18:37:18 +0000 (19:37 +0100)]
avfilter/vf_deshake: Free out AVFrame on error

Fixes memleak
Fixes part of CID1197065

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/vf_ciescope: Free out AVFrame on error
Michael Niedermayer [Fri, 3 Feb 2017 18:37:18 +0000 (19:37 +0100)]
avfilter/vf_ciescope: Free out AVFrame on error

Fixes memleak
Fixes part of CID1197065

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/ivi: use init_get_bits8()
Paul B Mahol [Fri, 3 Feb 2017 19:36:23 +0000 (20:36 +0100)]
avcodec/ivi: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavcodec/metasound: use init_get_bits8()
Paul B Mahol [Fri, 3 Feb 2017 19:29:27 +0000 (20:29 +0100)]
avcodec/metasound: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavcodec/xsubdec: use init_get_bits8()
Paul B Mahol [Fri, 3 Feb 2017 19:25:53 +0000 (20:25 +0100)]
avcodec/xsubdec: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavcodec/mpc7: use init_get_bits8()
Paul B Mahol [Fri, 3 Feb 2017 19:16:30 +0000 (20:16 +0100)]
avcodec/mpc7: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavcodec/mpc7: return meaningful error values
Paul B Mahol [Fri, 3 Feb 2017 19:14:13 +0000 (20:14 +0100)]
avcodec/mpc7: return meaningful error values

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavcodec/mpc8: use init_get_bits8()
Paul B Mahol [Fri, 3 Feb 2017 18:57:13 +0000 (19:57 +0100)]
avcodec/mpc8: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agolavf/isom: Support DTS Express in mov.
Carl Eugen Hoyos [Fri, 3 Feb 2017 18:01:59 +0000 (19:01 +0100)]
lavf/isom: Support DTS Express in mov.

Fixes ticket #6124.

2 years agodoc: add a lexicon
Clément Bœsch [Mon, 30 Jan 2017 14:58:13 +0000 (15:58 +0100)]
doc: add a lexicon

2 years agoavcodec/ituh263dec: Implement U263s interpretation of H.263 B frames
Michael Niedermayer [Fri, 3 Feb 2017 01:50:01 +0000 (02:50 +0100)]
avcodec/ituh263dec: Implement U263s interpretation of H.263 B frames

Fixes Ticket1536

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavutil/hwcontext_vaapi: fix SEGV in vaTerminate when vaInitialize fails
Aman Gupta [Thu, 2 Feb 2017 23:24:33 +0000 (15:24 -0800)]
avutil/hwcontext_vaapi: fix SEGV in vaTerminate when vaInitialize fails

Program terminated with signal SIGSEGV, Segmentation fault.
  #0  0x0000000000aff8a4 in vaTerminate ()
  #1  0x0000000000ae50ce in vaapi_device_free (ctx=<optimized out>) at libavutil/hwcontext_vaapi.c:882
  #2  0x0000000000ae1f9e in hwdevice_ctx_free (opaque=<optimized out>, data=<optimized out>) at libavutil/hwcontext.c:66
  #3  0x0000000000ad856f in buffer_replace (src=0x0, dst=0x7fffa26ef1b8) at libavutil/buffer.c:119
  #4  av_buffer_unref (buf=buf@entry=0x7fffa26ef1f8) at libavutil/buffer.c:129
  #5  0x0000000000ae299f in av_hwdevice_ctx_create (pdevice_ref=0x170ac50 <hw_device_ctx>, type=type@entry=AV_HWDEVICE_TYPE_VAAPI, device=<optimized out>,
      opts=opts@entry=0x0, flags=flags@entry=0) at libavutil/hwcontext.c:494
  #6  0x0000000000400968 in vaapi_device_init (device=<optimized out>) at ffmpeg_vaapi.c:223

Signed-off-by: Mark Thompson <sw@jkqxz.net>
2 years agoavcodec/utils: Fix memleak with subtitles and sidedata
Michael Niedermayer [Wed, 25 Jan 2017 11:56:52 +0000 (12:56 +0100)]
avcodec/utils: Fix memleak with subtitles and sidedata

Fixes: 454/fuzz-3-ffmpeg_SUBTITLE_AV_CODEC_ID_MOV_TEXT_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/scale: refactor common code for scaling height/width expressions
Aman Gupta [Thu, 2 Feb 2017 00:30:18 +0000 (16:30 -0800)]
avfilter/scale: refactor common code for scaling height/width expressions

Implements support for height/width expressions in vf_scale_vaapi,
by refactoring common code into a new libavfilter/scale.c

Signed-off-by: Mark Thompson <sw@jkqxz.net>
2 years agox86/rv34dsp: add ff_rv34_idct_dc_add_sse2
James Almer [Thu, 2 Feb 2017 20:51:21 +0000 (17:51 -0300)]
x86/rv34dsp: add ff_rv34_idct_dc_add_sse2

Also disable ff_rv34_idct_dc_add_mmx on x86_64 as the presence of sse2
is guaranteed in such builds.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agox86/vp8dsp: add ff_vp8_idct_dc_add_sse2
James Almer [Thu, 2 Feb 2017 20:18:58 +0000 (17:18 -0300)]
x86/vp8dsp: add ff_vp8_idct_dc_add_sse2

Also disable ff_vp8_idct_dc_add_mmx on x86_64 as the presence of sse2
is guaranteed in such builds.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agolibavcodec/cinepakenc.c: comments cleanup (contents)
addr-see-the-website@aetey.se [Sun, 29 Jan 2017 15:40:27 +0000 (16:40 +0100)]
libavcodec/cinepakenc.c: comments cleanup (contents)

Change the encoding of the original developer name from ISO-8859-1 to UTF-8.
Remove the stale/completed TODO list.
Fix two small typos.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/dca_lbr: Fix off by 1 error in freq check
Michael Niedermayer [Thu, 2 Feb 2017 14:23:31 +0000 (15:23 +0100)]
avcodec/dca_lbr: Fix off by 1 error in freq check

Fixes out of array read
Fixes: 510/clusterfuzz-testcase-5737865715646464

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 '9064777dbb335ab4809ae09e3fdcc0245f925cdc'
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>
2 years agoMerge commit '7f549b8338ed3775fec4bf10421ff5744e5866dd'
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>
2 years agoMerge commit '6135c3b61e084be93c0876cecd06f4e764f961c0'
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>
2 years agoMerge commit 'f637046d3134a331e4b5a7243ac3dfb92735b8a5'
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>
2 years agoMerge commit '6f9e34baea4f6f484392e4e67f606a0835d07b73'
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>
2 years agoMerge commit 'ed9b2a5178d7a7c5a95694da3a808af327f36aff'
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>
2 years agoffmpeg: Add a missing line break when requesting a sample.
Carl Eugen Hoyos [Thu, 2 Feb 2017 08:45:15 +0000 (09:45 +0100)]
ffmpeg: Add a missing line break when requesting a sample.

2 years agospeedhq: fix out-of-bounds write
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>
2 years agoswscale: add P016 input support
Philip Langdale [Sun, 20 Nov 2016 22:32:49 +0000 (14:32 -0800)]
swscale: add P016 input support

2 years agoffplay: allow borderless playback windows
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>
2 years agoavcodec/ituh263dec: Correct timestamp recovery for B frames
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>
2 years agoavcodec/wmalosslessdec: remove warning message as bug is fixed
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>
2 years agoavformat/msf: support codec 1, which is 16 bit pcm le
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>
2 years agoavcodec/atrac3: Add multichannel joint stereo ATRAC3
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>
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>