ffmpeg.git
3 years agoswscale/yuv2rgb: Factor YUVRGB_TABLE_LUMA_HEADROOM out
Michael Niedermayer [Thu, 14 Jan 2016 11:36:41 +0000 (12:36 +0100)]
swscale/yuv2rgb: Factor YUVRGB_TABLE_LUMA_HEADROOM out

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/af_dynaudnorm: fix possible null pointer dereference
Paul B Mahol [Thu, 14 Jan 2016 13:27:01 +0000 (14:27 +0100)]
avfilter/af_dynaudnorm: fix possible null pointer dereference

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/aacenc_is: replace pow(x, 0.75) by x/sqrtf(sqrtf(x))
Claudio Freire [Thu, 14 Jan 2016 03:38:22 +0000 (00:38 -0300)]
avcodec/aacenc_is: replace pow(x, 0.75) by x/sqrtf(sqrtf(x))

This is quite an accurate approximation; testing shows ~ 2ulp error in
the floating point result. Tested with FATE.

Alternatively, if one wants "full accuracy", one can use powf, or sqrt
instead of sqrtf. With powf, one gets 1 ulp error (theoretically should be 0, as
0.75 is exactly representable) on GNU libm, with sqrt, 0 ulp error.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Abstracted into pos_pow34 utility function

Signed-off-by: Claudio Freire <klaussfreire@gmail.com>
3 years agolavu/libm: add isfinite fallback
Ganesh Ajjanagadde [Thu, 14 Jan 2016 00:09:25 +0000 (19:09 -0500)]
lavu/libm: add isfinite fallback

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agodca: fix misaligned access in avpriv_dca_convert_bitstream
Andreas Cadhalpun [Tue, 12 Jan 2016 23:52:58 +0000 (00:52 +0100)]
dca: fix misaligned access in avpriv_dca_convert_bitstream

src and dst are only 8-bit-aligned, so accessing them as uint16_t causes
SIGBUS crashes on architectures like sparc.

This fixes ubsan runtime error: load of misaligned address for type
'const uint16_t', which requires 2 byte alignment

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoavformat/hls: forbid all protocols except http(s) & file
Maxim Andreev [Wed, 13 Jan 2016 08:51:12 +0000 (11:51 +0300)]
avformat/hls: forbid all protocols except http(s) & file

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/aacenc: Check for +-Inf too
Michael Niedermayer [Wed, 13 Jan 2016 21:33:59 +0000 (22:33 +0100)]
avcodec/aacenc: Check for +-Inf too

Fixes out of array read
Fixes: 04442da73d935b776d2236282588d4f9/signal_sigsegv_2625a69_8790_ae85ffc889070663319b3417ede777b0.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/wavpackenc: print channel count in av_log call
James Almer [Wed, 13 Jan 2016 22:26:40 +0000 (19:26 -0300)]
avcodec/wavpackenc: print channel count in av_log call

Fixes a warning with -Wformat-extra-args

3 years agoavcodec/diracdec: Handle the 0 vlc case at the top of coeff_unpack_golomb()
Michael Niedermayer [Tue, 12 Jan 2016 22:32:58 +0000 (23:32 +0100)]
avcodec/diracdec: Handle the 0 vlc case at the top of coeff_unpack_golomb()

decoding changes from 17 to 20 fps

Reviewed-by; Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/diracdec: Factor +2 out of the inner loop
Michael Niedermayer [Tue, 12 Jan 2016 22:32:57 +0000 (23:32 +0100)]
avcodec/diracdec: Factor +2 out of the inner loop

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/diracdec: Inline svq3_get_ue_golomb() and merge the sign bit decoding into it
Michael Niedermayer [Tue, 12 Jan 2016 22:32:56 +0000 (23:32 +0100)]
avcodec/diracdec: Inline svq3_get_ue_golomb() and merge the sign bit decoding into it

This avoids closing and opening the bit reader

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/aacenc: mark output as const as its not written to
Michael Niedermayer [Wed, 13 Jan 2016 15:40:22 +0000 (16:40 +0100)]
avcodec/aacenc: mark output as const as its not written to

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/aacenc: Fix NAN check
Michael Niedermayer [Wed, 13 Jan 2016 13:15:11 +0000 (14:15 +0100)]
avcodec/aacenc: Fix NAN check

All MDCT outputs must be checked in case of 128point MDCTs
Fixes: out of array read
Fixes: 04442da73d935b776d2236282588d4f9/signal_sigsegv_2625a69_351_52ca6226eb83547a2d26e322ce84ed84.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodiracdec: Add slice threading to HQ profile
Kieran Kunhya [Tue, 12 Jan 2016 00:51:49 +0000 (00:51 +0000)]
diracdec: Add slice threading to HQ profile

3 years agoAAC encoder: encode out-of-phase I/S efficiently
Claudio Freire [Sun, 10 Jan 2016 06:04:21 +0000 (03:04 -0300)]
AAC encoder: encode out-of-phase I/S efficiently

Use the ability to invert phase with ms_mask instead of changing
the codebook when possible, to avoid having to switch codebooks
if some bands are INTENSTY_BT and others are INTENSITY_BT2, since
usually a set ms_mask uses less bits that a codebook change. While
it may not always be a win (ie: if it causes an ms_mask bitmap
to be sent when it wouldn't have been otherwise), it's unlikely
since the ms_mask bitmap will almost always be there already for
M/S itself.

3 years agoAAC encoder: fix I/S relative error evaluation
Claudio Freire [Fri, 8 Jan 2016 09:18:24 +0000 (06:18 -0300)]
AAC encoder: fix I/S relative error evaluation

The relative error between two encoding strategies is the simple
difference of rate-distortion values, and not the absolute
difference. An absolute measure would allow worsening of the
quantization error as well as improving.

3 years agoAAC encoder: various fixes in M/S coding
Claudio Freire [Fri, 8 Jan 2016 08:31:32 +0000 (05:31 -0300)]
AAC encoder: various fixes in M/S coding

1. Fix sf_idx and band_type addressing to address only the first
subwindow in the group (others could hold garbage values)

2. Don't step on ms_mask when is_mask is set. I/S selection
already sets the ms_mask properly and shouldn't be overridden.

3. Use mid/sid cb/sf when computing coding error, as should be
since those are the cb/sfs that will eventually be set.

4. Fix distortion computation on multi-subwindow groups (was
subtracting the bits terms multiple times)

5. Clear ms_mask when one side uses PNS and the other doesn't.
When using PNS, ms_mask signals correlated noise, which can be
detected just like regular M/S detection, so we don't skip
noise bands, but when only one side uses PNS setting the flag
can confuse some encoders, so avoid that.

3 years agoAAC encoder: in IS, fix index of sf_idx, band_type
Claudio Freire [Fri, 8 Jan 2016 08:16:18 +0000 (05:16 -0300)]
AAC encoder: in IS, fix index of sf_idx, band_type

Correct addressing of sf_idx and band_type arrays in I/S code.

Both arrays don't guarantee valid values for subwindows at all
times, depending on which coder is being used, which could result
in reading of garbage values. Instead, only the first subwindow
in the window group has to be used, ie: use w*16+g instead of
(w+w2)*16+g

3 years agoAAC encoder: don't apply MS on special bands
Claudio Freire [Fri, 8 Jan 2016 08:04:37 +0000 (05:04 -0300)]
AAC encoder: don't apply MS on special bands

Change the condition for application of the M/S transform to match
that of the decoder. Namely, that no special coding books must be
in use in either channel. While the condition ought to be
equivalent to the current one when the invariant of is_mask is
kept, matching the decoder's condition is safer and easier to
maintain.

3 years agoAAC encoder: avoid assertion failure on PNS
Claudio Freire [Fri, 8 Jan 2016 07:39:02 +0000 (04:39 -0300)]
AAC encoder: avoid assertion failure on PNS

In rare corner cases it could still fail an assert on sf_diff due
to failure to update prev_sf in some code paths. Fix that case.

3 years agoAAC encoder: fix assertion error with prediction
Claudio Freire [Tue, 29 Dec 2015 08:18:40 +0000 (05:18 -0300)]
AAC encoder: fix assertion error with prediction

Fixes an assertion error reported in #2686 that happens when
using prediction (either explicitly or implicitly by setting
the AAC main profile), since prediction code would allow
creating new zeroes or removing existing ones, without
properly checking for SF delta violations.

This patch forbids creating/removing zeroes, perhaps an
overly conservative approach, but a safe one. More permissive
and sophisticated approaches may be attempted in the future.

3 years agolavc/mjpeg2jpeg: Accept more mjpeg streams as input.
Carl Eugen Hoyos [Wed, 13 Jan 2016 08:01:29 +0000 (09:01 +0100)]
lavc/mjpeg2jpeg: Accept more mjpeg streams as input.

Fixes ticket #5151.

3 years agoavutil/common: Protect GET_BYTE in GET_UTF8() by ()
Michael Niedermayer [Wed, 13 Jan 2016 01:33:48 +0000 (02:33 +0100)]
avutil/common: Protect GET_BYTE in GET_UTF8() by ()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/aviobuf: Fix end check in put_str16()
Michael Niedermayer [Wed, 13 Jan 2016 01:31:59 +0000 (02:31 +0100)]
avformat/aviobuf: Fix end check in put_str16()

Fixes out of array read
Fixes: 03c406ec9530e594a074ce2979f8a1f0/asan_heap-oob_7dec26_4664_37c52495b2870a2eaac65f53958e76c1.flac

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibvpxdec: fix 'ISO C90 forbids mixed declarations and code' warning
James Zern [Tue, 12 Jan 2016 06:38:01 +0000 (22:38 -0800)]
libvpxdec: fix 'ISO C90 forbids mixed declarations and code' warning

since:
cbcc88c libvpx: Support setting color range for vp9.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
3 years agoconfigure: showspectrum now uses fft, add showspectrumpic
Paul B Mahol [Tue, 12 Jan 2016 21:36:34 +0000 (22:36 +0100)]
configure: showspectrum now uses fft, add showspectrumpic

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/avf_showspectrum: reduce number of operations
Paul B Mahol [Sun, 10 Jan 2016 17:30:16 +0000 (18:30 +0100)]
avfilter/avf_showspectrum: reduce number of operations

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/avf_showspectrum: add posibility to display phase
Paul B Mahol [Sun, 10 Jan 2016 13:20:59 +0000 (14:20 +0100)]
avfilter/avf_showspectrum: add posibility to display phase

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agolavf/mpjpegdec: Do not call av_log() while probing.
Carl Eugen Hoyos [Tue, 12 Jan 2016 19:35:03 +0000 (20:35 +0100)]
lavf/mpjpegdec: Do not call av_log() while probing.

3 years agoavformat/asfenc: Check pts
Michael Niedermayer [Tue, 12 Jan 2016 17:49:20 +0000 (18:49 +0100)]
avformat/asfenc: Check pts

Fixes integer overflow
Fixes: 0063df8be3aaa30dd6d76f59c8f818c8/signal_sigsegv_7b7b59_3634_bf418b6822bbfa68734411d96b667be3.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/asfenc: Flush packet before duration becomes unrepresentable
Michael Niedermayer [Tue, 12 Jan 2016 17:26:34 +0000 (18:26 +0100)]
avformat/asfenc: Flush packet before duration becomes unrepresentable

Fixes: 0063df8be3aaa30dd6d76f59c8f818c8/signal_sigsegv_7b7b59_3634_bf418b6822bbfa68734411d96b667be3.mov
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/truemotion2: Cleanup in case of tm2_read_stream() failure
Michael Niedermayer [Tue, 12 Jan 2016 14:56:29 +0000 (15:56 +0100)]
avcodec/truemotion2: Cleanup in case of tm2_read_stream() failure

Fixes memleaks
Fixes: 245dae71bc28fe8f3f454300277e575a/signal_sigabrt_7ffff6ae7cb7_5062_f7d9dfa385454806586076f9db48c0bf.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/mjpeg2jpeg: Check for jpeg file header.
Carl Eugen Hoyos [Tue, 12 Jan 2016 15:13:27 +0000 (16:13 +0100)]
lavc/mjpeg2jpeg: Check for jpeg file header.

3 years agolavf/matroskadec: Use av_realloc() in get_qt_codec()
Mats Peterson [Mon, 11 Jan 2016 06:43:29 +0000 (07:43 +0100)]
lavf/matroskadec: Use av_realloc() in get_qt_codec()

Use av_realloc() rather than av_malloc() when normalizing noncompliant
private data in get_qt_codec().

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoCorrect two build/built typos
Timothy Gu [Tue, 12 Jan 2016 04:51:03 +0000 (20:51 -0800)]
Correct two build/built typos

Found-by: Leo Izen <leo.izen@gmail.com> as thebombzen on IRC
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
3 years agoavcodec/mpeg4video: Check time_incr
Michael Niedermayer [Tue, 12 Jan 2016 02:03:01 +0000 (03:03 +0100)]
avcodec/mpeg4video: Check time_incr

Fixes assertion failure
Fixes out of memory access

Fixes: test_casex.ivf

Found-by: Tyson Smith <twsmith@mozilla.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agortmpdh: Initialize gcrypt before using it
Ricardo Constantino [Tue, 29 Dec 2015 21:40:14 +0000 (21:40 +0000)]
rtmpdh: Initialize gcrypt before using it

Either disabling or init'ing secure memory is required after the use
of gcry_check_version. From a look at the functions rtmpdh uses, I
noticed none require the use of secure memory, so we disable it [1][2].

This resolves some errors returned by rtmpdh code with uninitialized
gcrypt, especifically:
Fatal: failed to create the RNG lock: Invalid argument
FATAL: failed to acquire the FSM lock in libgrypt: Invalid argument

Version "1.5.4" was arbitrarily chosen. An older version probably works
as well, but I couldn't compile older versions to test on my machine.

[1]
https://gnupg.org/documentation/manuals/gcrypt/Initializing-the-library.html
[2]
https://www.gnupg.org/documentation/manuals/gcrypt/Controlling-the-library.html

Signed-off-by: Ricardo Constantino <wiiaboo@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodiracdec: fix idwt_stride calculation in bytes
Andreas Cadhalpun [Mon, 11 Jan 2016 22:19:40 +0000 (23:19 +0100)]
diracdec: fix idwt_stride calculation in bytes

The transformation to bytes must happen after alignment to get the same
resulting pointers as before.

This fixes segmentation faults in the assembler code.

The regression was introduced in commit 9553689.

Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agolavc/cbrt_tablegen: speed up tablegen
Ganesh Ajjanagadde [Mon, 11 Jan 2016 22:09:44 +0000 (17:09 -0500)]
lavc/cbrt_tablegen: speed up tablegen

This exploits an approach based on the sieve of Eratosthenes, a popular
method for generating prime numbers.

Tables are identical to previous ones.

Tested with FATE with/without --enable-hardcoded-tables.

Sample benchmark (Haswell, GNU/Linux+gcc):
prev:
7860100 decicycles in cbrt_tableinit,       1 runs,      0 skips
7777490 decicycles in cbrt_tableinit,       2 runs,      0 skips
[...]
7582339 decicycles in cbrt_tableinit,     256 runs,      0 skips
7563556 decicycles in cbrt_tableinit,     512 runs,      0 skips

new:
2099480 decicycles in cbrt_tableinit,       1 runs,      0 skips
2044470 decicycles in cbrt_tableinit,       2 runs,      0 skips
[...]
1796544 decicycles in cbrt_tableinit,     256 runs,      0 skips
1791631 decicycles in cbrt_tableinit,     512 runs,      0 skips

Both small and large run count given as this is called once so small run
count may give a better picture, small numbers are fairly consistent,
and there is a consistent downward trend from small to large runs,
at which point it stabilizes to a new value.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
3 years agoffmdec: change type of len to ptrdiff_t
Andreas Cadhalpun [Sat, 2 Jan 2016 15:32:09 +0000 (16:32 +0100)]
ffmdec: change type of len to ptrdiff_t

It is used to store the difference between pointers, so ptrdiff_t is the
correct type.

This prevents potential overflows.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoqtpalette: make the color_* variables unsigned again
Andreas Cadhalpun [Sun, 10 Jan 2016 09:53:33 +0000 (10:53 +0100)]
qtpalette: make the color_* variables unsigned again

This fixes segmentation faults due to out of bounds writes, when
color_start is interpreted as negative number.

This regression was introduced in commit 57631f.

Reviewed-by: Mats Peterson <matsp888@yahoo.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoavcodec/wavpackenc: Check the number of channels
Michael Niedermayer [Mon, 11 Jan 2016 17:58:08 +0000 (18:58 +0100)]
avcodec/wavpackenc: Check the number of channels

They are stored in a byte, thus more than 255 is not possible

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/wavpackenc: Headers are per channel
Michael Niedermayer [Mon, 11 Jan 2016 17:32:32 +0000 (18:32 +0100)]
avcodec/wavpackenc: Headers are per channel

Fixes: 1b8b83a53bfa751f01b1daa65a4758db/signal_sigabrt_7ffff6ae7cb7_7488_403f71d1a2565b598d01b6cb110fac8f.aiff
Fixes: assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/dfa: Fix packet leak on error
Michael Niedermayer [Mon, 11 Jan 2016 16:08:07 +0000 (17:08 +0100)]
avformat/dfa: Fix packet leak on error

Fixes: 07fa81f300736485e585b63e7b1cd155/signal_sigabrt_7ffff6ae7cb7_16_94ee815791a1357826524072db5bc2dc.dfa

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf/matroskadec: Normalize noncompliant A_QUICKTIME/V_QUICKTIME private data
Mats Peterson [Sun, 10 Jan 2016 02:59:21 +0000 (03:59 +0100)]
lavf/matroskadec: Normalize noncompliant A_QUICKTIME/V_QUICKTIME private data

This patch adds a new static function get_qt_codec() that takes care of
the initial retrieval of the fourcc and codec ID for A_QUICKTIME and
V_QUICKTIME. It also normalizes noncompliant private data found in some
older files that incorrectly starts with the fourcc by expanding/shifting
the data by 4 bytes, and storing the data size at the start. This is
necessary in order for the rest of the code in the A_QUICKTIME and
V_QUICKTIME blocks (and most likely other code as well) to correctly
parse the private data.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/ac3enc: Remove duplicate #include
Michael Niedermayer [Sun, 10 Jan 2016 21:12:36 +0000 (22:12 +0100)]
avcodec/ac3enc: Remove duplicate #include

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/aacdec_template: Check id_map
Michael Niedermayer [Sun, 10 Jan 2016 18:29:39 +0000 (19:29 +0100)]
avcodec/aacdec_template: Check id_map

Fixes index out of bounds error
Fixes: aac_index_out_of_bounds.wmv

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/dvdec: Fix "left shift of negative value -254"
Michael Niedermayer [Sun, 10 Jan 2016 16:43:56 +0000 (17:43 +0100)]
avcodec/dvdec: Fix "left shift of negative value -254"

Fixes: dvdec_left_shift.avi

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/g2meet: Check for ff_els_decode_bit() failure in epic_decode_run_length()
Michael Niedermayer [Sun, 10 Jan 2016 15:59:42 +0000 (16:59 +0100)]
avcodec/g2meet: Check for ff_els_decode_bit() failure in epic_decode_run_length()

Fixes invalid shift
Fixes: g2m_left_shift_2.wmv

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: fix sub-cc font
Clément Bœsch [Sun, 10 Jan 2016 15:31:30 +0000 (16:31 +0100)]
fate: fix sub-cc font

3 years agolavc/ccaption_dec: improve default style
Clément Bœsch [Sun, 10 Jan 2016 15:19:50 +0000 (16:19 +0100)]
lavc/ccaption_dec: improve default style

Use monospaced font, and a black box outline.

3 years agoavcodec/mjpegdec: Fix negative shift
Michael Niedermayer [Sun, 10 Jan 2016 14:52:09 +0000 (15:52 +0100)]
avcodec/mjpegdec: Fix negative shift

Fixes: mjpeg_left_shift.avi

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/x264: Add compatibility values for coder options.
Carl Eugen Hoyos [Sun, 10 Jan 2016 13:25:56 +0000 (14:25 +0100)]
lavc/x264: Add compatibility values for coder options.

Fixes ticket #5142.

3 years agolavf/concatdec: do not access packet if av_read_frame returned error
Marton Balint [Sat, 28 Nov 2015 12:05:30 +0000 (13:05 +0100)]
lavf/concatdec: do not access packet if av_read_frame returned error

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agolavc/ccaption_dec: fix ASS tags
Clément Bœsch [Sun, 10 Jan 2016 13:01:14 +0000 (14:01 +0100)]
lavc/ccaption_dec: fix ASS tags

3 years agoavcodec/mss2: Check for repeat overflow
Michael Niedermayer [Sun, 10 Jan 2016 11:19:48 +0000 (12:19 +0100)]
avcodec/mss2: Check for repeat overflow

Fixes: mss2_left_shift.wmv

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/codec_desc: Add ff_aac_profiles to aac_latm
Michael Niedermayer [Fri, 1 Jan 2016 17:14:24 +0000 (18:14 +0100)]
avcodec/codec_desc: Add ff_aac_profiles to aac_latm

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavf_showspectrum: Silence "deprecated pixel format" warning
Timothy Gu [Sat, 9 Jan 2016 18:45:48 +0000 (10:45 -0800)]
avf_showspectrum: Silence "deprecated pixel format" warning

3 years agoavfilter/avf_showspectrum: set color range to frame
Paul B Mahol [Sat, 9 Jan 2016 19:09:52 +0000 (20:09 +0100)]
avfilter/avf_showspectrum: set color range to frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agolibvpx: Support setting color range for vp9.
Sasi Inguva [Sat, 9 Jan 2016 15:48:49 +0000 (12:48 -0300)]
libvpx: Support setting color range for vp9.

Pass through color range to vp9 encoder. Parse color range in libvpxdec.c.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat: Add integer fps from 31 to 60 to get_std_framerate()
Michael Niedermayer [Sat, 9 Jan 2016 09:49:23 +0000 (10:49 +0100)]
avformat: Add integer fps from 31 to 60 to get_std_framerate()

Fixes Ticket 5106

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/encoders: fix typo in AAC encoder documentation
Rostislav Pehlivanov [Sat, 9 Jan 2016 13:20:42 +0000 (13:20 +0000)]
doc/encoders: fix typo in AAC encoder documentation

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agolavc/ccaption_dec: simplify rollup cases
Clément Bœsch [Sat, 9 Jan 2016 11:44:10 +0000 (12:44 +0100)]
lavc/ccaption_dec: simplify rollup cases

3 years agolavc/ccaption_dec: check for bprint completeness outside the loop
Clément Bœsch [Sat, 9 Jan 2016 11:40:28 +0000 (12:40 +0100)]
lavc/ccaption_dec: check for bprint completeness outside the loop

3 years agolavc/ccaption_dec: mark row and font as const in capture_screen()
Clément Bœsch [Sat, 9 Jan 2016 11:38:36 +0000 (12:38 +0100)]
lavc/ccaption_dec: mark row and font as const in capture_screen()

3 years agolavc/ccaption_dec: fix mixed declarations and code warning
Clément Bœsch [Sat, 9 Jan 2016 11:37:30 +0000 (12:37 +0100)]
lavc/ccaption_dec: fix mixed declarations and code warning

3 years agolavc/ccaption_dec: check for bprint completeness only at the end
Clément Bœsch [Sat, 9 Jan 2016 11:37:11 +0000 (12:37 +0100)]
lavc/ccaption_dec: check for bprint completeness only at the end

3 years agolavc/ccaption_dec: implement font styles
Aman Gupta [Sat, 9 Jan 2016 03:52:09 +0000 (19:52 -0800)]
lavc/ccaption_dec: implement font styles

3 years agolavc/ccaption_dec: simplify by incrementing cursor_column inside write_char()
Aman Gupta [Sat, 9 Jan 2016 03:24:44 +0000 (19:24 -0800)]
lavc/ccaption_dec: simplify by incrementing cursor_column inside write_char()

3 years agolavc/ccaption_dec: simplify by passing screen into write_char()
Aman Gupta [Sat, 9 Jan 2016 03:21:16 +0000 (19:21 -0800)]
lavc/ccaption_dec: simplify by passing screen into write_char()

3 years agolavc/ccaption_dec: extract capture_screen() for future use
Aman Gupta [Sat, 9 Jan 2016 01:56:09 +0000 (17:56 -0800)]
lavc/ccaption_dec: extract capture_screen() for future use

unlike reap_screen(), capture_screen() can be used to populate buffer
without touching the timestamps. this is useful for upcoming commits
which implement a real time caption stream.

3 years agolavc/ccaption_dec: clear buffer before populating with screen contents
Aman Gupta [Sat, 9 Jan 2016 01:54:29 +0000 (17:54 -0800)]
lavc/ccaption_dec: clear buffer before populating with screen contents

3 years agolavc/ccaption_dec: centralize buffer_changed=1 into reap_screen
Aman Gupta [Sat, 9 Jan 2016 01:53:20 +0000 (17:53 -0800)]
lavc/ccaption_dec: centralize buffer_changed=1 into reap_screen

3 years agolavc/ccaption_dec: rename screen_changed to buffer_changed
Aman Gupta [Sat, 9 Jan 2016 01:51:32 +0000 (17:51 -0800)]
lavc/ccaption_dec: rename screen_changed to buffer_changed

3 years agolavc/ccaption_dec: extract ass time base into constant
Aman Gupta [Wed, 6 Jan 2016 06:55:18 +0000 (22:55 -0800)]
lavc/ccaption_dec: extract ass time base into constant

3 years agolavc/ccaption_dec: combine ROLLUP modes as they are identical
Aman Gupta [Wed, 6 Jan 2016 05:41:03 +0000 (21:41 -0800)]
lavc/ccaption_dec: combine ROLLUP modes as they are identical

3 years agoRevert "lavc/ccaption_dec: reap_screen() is responsible for clearing output buffer...
Aman Gupta [Sat, 9 Jan 2016 01:40:22 +0000 (17:40 -0800)]
Revert "lavc/ccaption_dec: reap_screen() is responsible for clearing output buffer and signaling screen_changed"

This reverts commit 53ee84f811c3a3e55c688116d41310e76d285d9e.

3 years agoRevert "lavc/ccaption_dec: implement "erase non displayed memory""
Aman Gupta [Sat, 9 Jan 2016 01:40:11 +0000 (17:40 -0800)]
Revert "lavc/ccaption_dec: implement "erase non displayed memory""

This reverts commit 26abdd61a39735c7907297e9b5c8bfe5255be555.

3 years agoRevert "lavc/ccaption_dec: reap_screen is not necessary when clearing screen or buffer"
Aman Gupta [Sat, 9 Jan 2016 01:40:04 +0000 (17:40 -0800)]
Revert "lavc/ccaption_dec: reap_screen is not necessary when clearing screen or buffer"

This reverts commit fe225b113b0553cdcf1a1d2fbdbe37c467d7951b.

3 years agolavc/libvpxenc: Improve documentation for option cpu-used.
Carl Eugen Hoyos [Sat, 9 Jan 2016 09:53:22 +0000 (10:53 +0100)]
lavc/libvpxenc: Improve documentation for option cpu-used.

Fixes ticket #5140.
Reviewed-by: James Zern
3 years agoavformat/movenc: Check that pkt duration is within 32bit range
Michael Niedermayer [Sat, 9 Jan 2016 02:36:19 +0000 (03:36 +0100)]
avformat/movenc: Check that pkt duration is within 32bit range

Durations outside are not supported

Fixes Ticket5114
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoconfigure: Use libgcrypt-config's cflags
Ricardo Constantino [Fri, 8 Jan 2016 23:40:50 +0000 (23:40 +0000)]
configure: Use libgcrypt-config's cflags

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/ivfenc: fix division by zero
Michael Niedermayer [Fri, 8 Jan 2016 22:01:30 +0000 (23:01 +0100)]
avformat/ivfenc: fix division by zero

Fixes Ticket 5115

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/ccaption_dec: reap_screen is not necessary when clearing screen or buffer
Aman Gupta [Tue, 5 Jan 2016 23:06:02 +0000 (15:06 -0800)]
lavc/ccaption_dec: reap_screen is not necessary when clearing screen or buffer

3 years agoconfigure: Use libgcrypt-config if available
Ricardo Constantino [Tue, 29 Dec 2015 22:47:05 +0000 (22:47 +0000)]
configure: Use libgcrypt-config if available

Signed-off-by: Ricardo Constantino <wiiaboo@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/ccaption_dec: implement "erase non displayed memory"
Aman Gupta [Tue, 5 Jan 2016 22:54:54 +0000 (14:54 -0800)]
lavc/ccaption_dec: implement "erase non displayed memory"

3 years agolavc/ccaption_dec: reap_screen() is responsible for clearing output buffer and signal...
Aman Gupta [Tue, 5 Jan 2016 22:53:29 +0000 (14:53 -0800)]
lavc/ccaption_dec: reap_screen() is responsible for clearing output buffer and signaling screen_changed

moves the screen_changed bit and the bprint_clear into reap_screen() so
the logic is centralized and callers do not need to touch the bit or the
buffer before calling reap_screen()

3 years agox86/float_dsp: zero extend offset from ff_scalarproduct_float_sse
James Almer [Fri, 8 Jan 2016 15:08:56 +0000 (12:08 -0300)]
x86/float_dsp: zero extend offset from ff_scalarproduct_float_sse

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agox86/float_dsp: zero extend len from ff_butterflies_float_sse implicitly
James Almer [Fri, 8 Jan 2016 15:08:42 +0000 (12:08 -0300)]
x86/float_dsp: zero extend len from ff_butterflies_float_sse implicitly

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agox86/float_dsp: remove len check from ff_butterflies_float_sse
James Almer [Fri, 8 Jan 2016 15:08:23 +0000 (12:08 -0300)]
x86/float_dsp: remove len check from ff_butterflies_float_sse

The function documentation explicitly mentions it needs to be a multiple of 4.

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolavc/ccaption_dec: remove unused return value from internal functions
Aman Gupta [Tue, 5 Jan 2016 22:50:45 +0000 (14:50 -0800)]
lavc/ccaption_dec: remove unused return value from internal functions

3 years agolavc/ccaption_dec: clean up whitespace
Aman Gupta [Tue, 5 Jan 2016 23:18:09 +0000 (15:18 -0800)]
lavc/ccaption_dec: clean up whitespace

3 years agoavfilter/avf_showspectrum: add cool color map
Paul B Mahol [Fri, 8 Jan 2016 16:09:46 +0000 (17:09 +0100)]
avfilter/avf_showspectrum: add cool color map

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/avf_showfreqs: fix possible null pointer dereference
Paul B Mahol [Fri, 8 Jan 2016 13:56:15 +0000 (14:56 +0100)]
avfilter/avf_showfreqs: fix possible null pointer dereference

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavformat/mov: Simplify format checking code
Michael Niedermayer [Fri, 8 Jan 2016 13:23:11 +0000 (14:23 +0100)]
avformat/mov: Simplify format checking code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf/matroskadec: A_QUICKTIME and fourcc 0x00000000
Mats Peterson [Fri, 8 Jan 2016 11:55:59 +0000 (12:55 +0100)]
lavf/matroskadec: A_QUICKTIME and fourcc 0x00000000

In many older QuickTime files, the audio format, or "fourcc", is
0x00000000. The QuickTime File Format Specification states the following
regarding this situation:

"This format descriptor should not be used, but may be found in some
files. Samples are assumed to be stored in either 'raw ' or 'twos'
format, depending on the sample size field in the sound description."

MPlayer handles this logic by itself, but FFmpeg/FFplay currently does
not.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf/mov: Audio and fourcc 0x00000000
Mats Peterson [Fri, 8 Jan 2016 11:59:13 +0000 (12:59 +0100)]
lavf/mov: Audio and fourcc 0x00000000

In many older QuickTime files, the audio format, or "fourcc", is
0x00000000. The QuickTime File Format Specification states the following
regarding this situation:

"This format descriptor should not be used, but may be found in some
files. Samples are assumed to be stored in either 'raw ' or 'twos'
format, depending on the sample size field in the sound description."

MPlayer handles this logic by itself, but FFmpeg/FFplay currently does
not.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agox86/vf_w3fdif: 32-bit compatibility for w3fdif_simple_high
Hendrik Leppkes [Thu, 7 Jan 2016 02:29:21 +0000 (03:29 +0100)]
x86/vf_w3fdif: 32-bit compatibility for w3fdif_simple_high

3 years agoavfilter/avf_showspectrum: add option to draw legend
Paul B Mahol [Sat, 2 Jan 2016 22:01:25 +0000 (23:01 +0100)]
avfilter/avf_showspectrum: add option to draw legend

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoffmpeg: check fclose return values
Ganesh Ajjanagadde [Thu, 7 Jan 2016 04:57:47 +0000 (20:57 -0800)]
ffmpeg: check fclose return values

In the spirit of commit a956840cbc. Simple method to reproduce:
pass -vstats_file /dev/full to ffmpeg.

All raw fclose usages in ffmpeg.c taken care of here.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>