ffmpeg.git
5 years agolavc: add yuv440p10/12 formats to aligned pixfmt list.
Ronald S. Bultje [Wed, 6 May 2015 16:04:14 +0000 (12:04 -0400)]
lavc: add yuv440p10/12 formats to aligned pixfmt list.

5 years agolavu: add yuv440p10/12 pixfmts.
Ronald S. Bultje [Tue, 5 May 2015 13:37:59 +0000 (09:37 -0400)]
lavu: add yuv440p10/12 pixfmts.

5 years agodirac: use and forward error codes
Andreas Cadhalpun [Wed, 6 May 2015 14:54:40 +0000 (16:54 +0200)]
dirac: use and forward error codes

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/cws2fws: Use a similar implementation in dbgprintf() as in ff_dlog()
Michael Niedermayer [Wed, 6 May 2015 14:09:26 +0000 (16:09 +0200)]
tools/cws2fws: Use a similar implementation in dbgprintf() as in ff_dlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp8: Suppress empty body warnings
Michael Niedermayer [Wed, 6 May 2015 14:02:57 +0000 (16:02 +0200)]
avcodec/vp8: Suppress empty body warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/internal: Suppress empty body warning from emms_c()
Michael Niedermayer [Wed, 6 May 2015 13:46:25 +0000 (15:46 +0200)]
avutil/internal: Suppress empty body warning from emms_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/xcbgrab: fix comparison with screen size.
Nicolas George [Wed, 6 May 2015 09:53:19 +0000 (11:53 +0200)]
lavd/xcbgrab: fix comparison with screen size.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoOS/2:Makedef.cmd cleanup
Dave Yeo [Wed, 6 May 2015 04:07:59 +0000 (21:07 -0700)]
OS/2:Makedef.cmd cleanup

Remove PROTMODE as it doesn't make sense for DLLs. Also fixes a warning with the OpenWatcom linker
Export symbols as names rather then ordinals for better compatibility for minor releases.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: Fix types and wraparounds in dirac_decode_picture_header()
Michael Niedermayer [Wed, 6 May 2015 00:44:21 +0000 (02:44 +0200)]
avcodec/diracdec: Fix types and wraparounds in dirac_decode_picture_header()

previously various variables had a too small type to support the required 32bit unsigned
range allowed from the spec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodiracdec: check if reference could not be allocated
Andreas Cadhalpun [Tue, 5 May 2015 21:51:48 +0000 (23:51 +0200)]
diracdec: check if reference could not be allocated

s->ref_pics[i] is later used as ref argument of interpolate_refplane,
where it is dereferenced.

If it is NULL, it causes a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodiracdec: avoid overflow of bytes*8 in decode_lowdelay
Andreas Cadhalpun [Tue, 5 May 2015 20:10:44 +0000 (22:10 +0200)]
diracdec: avoid overflow of bytes*8 in decode_lowdelay

If bytes is large enough, bytes*8 can overflow and become negative.

In that case 'bufsize -= bytes*8' causes bufsize to increase instead of
decrease.

This leads to a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3735b5c616770429572f86aabdaec39c6ebb8818'
Michael Niedermayer [Tue, 5 May 2015 21:21:24 +0000 (23:21 +0200)]
Merge commit '3735b5c616770429572f86aabdaec39c6ebb8818'

* commit '3735b5c616770429572f86aabdaec39c6ebb8818':
  Revert "lavfi: always check av_expr_parse_and_eval() return value"

See: 8c9a23833daa88bdf08b7e7fbf3a64ab689ad373
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/riff: Add MultiScope II fourcc MSC2 as MJPEG.
Carl Eugen Hoyos [Tue, 5 May 2015 21:51:20 +0000 (23:51 +0200)]
lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG.

5 years agoMerge commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818'
Michael Niedermayer [Tue, 5 May 2015 20:57:12 +0000 (22:57 +0200)]
Merge commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818'

* commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818':
  alsdec: only adapt order for positive max_order

See: 58d605ee9b3277289278dc40e022311f8e083833
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838'
Michael Niedermayer [Tue, 5 May 2015 20:55:45 +0000 (22:55 +0200)]
Merge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838'

* commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838':
  alsdec: check sample pointer range in revert_channel_correlation

Conflicts:
libavcodec/alsdec.c

See: afc7748d1f6abc4b3b1cc957b0fa6941837db3d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe'
Michael Niedermayer [Tue, 5 May 2015 20:45:30 +0000 (22:45 +0200)]
Merge commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe'

* commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe':
  aacpsy: correct calculation of minath in psy_3gpp_init

See: ca9849eecdf7db91d652c698018a5b096d8b78c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e191aaca44b986816695e3b7ecfae64697fd6631'
Michael Niedermayer [Tue, 5 May 2015 20:32:57 +0000 (22:32 +0200)]
Merge commit 'e191aaca44b986816695e3b7ecfae64697fd6631'

* commit 'e191aaca44b986816695e3b7ecfae64697fd6631':
  alsdec: limit avctx->bits_per_raw_sample to 32

See: 4c2b88678b436f59132386d9be2fc143e3ee480d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8fc8024ea56e814cd257d5fe27b21a865080782f'
Michael Niedermayer [Tue, 5 May 2015 20:20:02 +0000 (22:20 +0200)]
Merge commit '8fc8024ea56e814cd257d5fe27b21a865080782f'

* commit '8fc8024ea56e814cd257d5fe27b21a865080782f':
  aasc: return correct buffer size from aasc_decode_frame

See: 0be54ad280cf114c02306b7063147e8379f8ed1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: Move buf[] read after size check
Michael Niedermayer [Tue, 5 May 2015 20:01:58 +0000 (22:01 +0200)]
avcodec/diracdec: Move buf[] read after size check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodiracdec: prevent overflow in data_unit_size check
Andreas Cadhalpun [Tue, 5 May 2015 19:33:08 +0000 (21:33 +0200)]
diracdec: prevent overflow in data_unit_size check

buf_idx + data_unit_size can overflow, causing the '> buf_size' check to
wrongly fail.

This causes a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: error out if chroma subsampling changes between frames.
Ronald S. Bultje [Tue, 5 May 2015 12:26:50 +0000 (08:26 -0400)]
vp9: error out if chroma subsampling changes between frames.

This can happen after an intra-only frame. For reference, see:
https://groups.google.com/a/webmproject.org/forum/#!msg/webm-discuss/zaoTxREZjq8/v5Enht87AhcJ

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "lavfi: always check av_expr_parse_and_eval() return value"
Anton Khirnov [Sat, 2 May 2015 07:09:52 +0000 (09:09 +0200)]
Revert "lavfi: always check av_expr_parse_and_eval() return value"

This reverts commit 63be97ec403023fb664798432acedaf6e6922527.

All those calls were unchecked on purpose, as explained in the comments
in the code.

5 years agoalsdec: only adapt order for positive max_order
Andreas Cadhalpun [Wed, 22 Apr 2015 14:03:41 +0000 (16:03 +0200)]
alsdec: only adapt order for positive max_order

For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1)

CC: libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoalsdec: check sample pointer range in revert_channel_correlation
Andreas Cadhalpun [Tue, 21 Apr 2015 17:28:30 +0000 (19:28 +0200)]
alsdec: check sample pointer range in revert_channel_correlation

Also change the type of begin, end and smp to ptrdiff_t to make the
comparison well-defined.

CC: libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavformat/matroskaenc: Use avoid_negative_ts_use_pts if no stream writes dts
Michael Niedermayer [Tue, 5 May 2015 10:57:24 +0000 (12:57 +0200)]
avformat/matroskaenc: Use avoid_negative_ts_use_pts if no stream writes dts

This reduces the number of cases where timestamps need to be shifted

Fixes Ticket4487

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mux: Add avoid_negative_ts_use_pts
Michael Niedermayer [Tue, 5 May 2015 10:44:20 +0000 (12:44 +0200)]
avformat/mux: Add avoid_negative_ts_use_pts

This allows using pts instead of dts for negative TS avoidance

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils: Add libm.h for round()
Michael Niedermayer [Tue, 5 May 2015 09:49:44 +0000 (11:49 +0200)]
cmdutils: Add libm.h for round()

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaacpsy: correct calculation of minath in psy_3gpp_init
Andreas Cadhalpun [Tue, 21 Apr 2015 16:43:55 +0000 (18:43 +0200)]
aacpsy: correct calculation of minath in psy_3gpp_init

The minimum of the ath(x, ATH_ADD) function depends on ATH_ADD.
This patch uses the first order approximation to determine it.

For ATH_ADD = 4 this results in the value at 3407.06812 (-5.24241638)
not the one at 3410 (-5.24237967).

CC: libav-stabl@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoalsdec: limit avctx->bits_per_raw_sample to 32
Andreas Cadhalpun [Sat, 18 Apr 2015 18:29:13 +0000 (20:29 +0200)]
alsdec: limit avctx->bits_per_raw_sample to 32

avctx->bits_per_raw_sample is used in get_sbits_long, which only
supports up to 32 bits.

CC: libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoaasc: return correct buffer size from aasc_decode_frame
Andreas Cadhalpun [Thu, 16 Apr 2015 17:12:02 +0000 (19:12 +0200)]
aasc: return correct buffer size from aasc_decode_frame

CC: libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agocmdutils: move get_rotation() up in the file
James Almer [Tue, 5 May 2015 05:46:42 +0000 (02:46 -0300)]
cmdutils: move get_rotation() up in the file

Fixes compilation of fftools without libavdevice

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavfilter/Makefile: add missing lavfutils.c dependency to cover_rect and find_rect...
James Almer [Tue, 5 May 2015 05:14:10 +0000 (02:14 -0300)]
avfilter/Makefile: add missing lavfutils.c dependency to cover_rect and find_rect filters

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/mpeg12dec: use the correct dimensions for checking SAR
Michael Niedermayer [Tue, 5 May 2015 02:15:31 +0000 (04:15 +0200)]
avcodec/mpeg12dec: use the correct dimensions for checking SAR

Fixes Ticket4533

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/deinterlace: use INIT_MMX like other asm code does too
Michael Niedermayer [Tue, 5 May 2015 00:19:30 +0000 (02:19 +0200)]
avcodec/x86/deinterlace: use INIT_MMX like other asm code does too

5 years agoavformat/avidec: print a warning for negative sample_size
Michael Niedermayer [Mon, 4 May 2015 21:42:24 +0000 (23:42 +0200)]
avformat/avidec: print a warning for negative sample_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavidec: avoid infinite loop due to negative ast->sample_size
Andreas Cadhalpun [Mon, 4 May 2015 21:01:45 +0000 (23:01 +0200)]
avidec: avoid infinite loop due to negative ast->sample_size

If max in clean_index is set to a negative ast->sample_size, the
following loop never ends:
        while (max < 1024)
            max += max;

Thus set ast->sample_size to 0 if it would otherwise be negative.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: add profile names
James Almer [Mon, 4 May 2015 21:37:50 +0000 (18:37 -0300)]
vp9: add profile names

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavfilter/vf_cover_rect: clip rectangle if it is partly outside the input
Michael Niedermayer [Mon, 4 May 2015 20:33:17 +0000 (22:33 +0200)]
avfilter/vf_cover_rect: clip rectangle if it is partly outside the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavidec: check for valid bit_rate range
Andreas Cadhalpun [Mon, 4 May 2015 19:07:52 +0000 (21:07 +0200)]
avidec: check for valid bit_rate range

If bit_rate is negative, it can trigger an av_assert2 in av_rescale_rnd.

Since av_rescale returns int64_t, but st->codec_bit_rate is int, it can
also overflow into a negative value.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 4 May 2015 15:59:45 +0000 (17:59 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavfi/cropdetect: Fix cropdetect for > 8 bit input.
  lavf/apngenc: Fix png remuxing by using default extension apng.
  lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/cropdetect: Fix cropdetect for > 8 bit input.
Carl Eugen Hoyos [Mon, 4 May 2015 15:50:16 +0000 (17:50 +0200)]
lavfi/cropdetect: Fix cropdetect for > 8 bit input.

5 years agolavf/apngenc: Fix png remuxing by using default extension apng.
Carl Eugen Hoyos [Mon, 4 May 2015 15:49:36 +0000 (17:49 +0200)]
lavf/apngenc: Fix png remuxing by using default extension apng.

5 years agolavf/mxfenc: Write correct interlaced flag when muxing dnxhd.
Carl Eugen Hoyos [Mon, 4 May 2015 15:44:14 +0000 (17:44 +0200)]
lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.

Reported and early patch version tested by forum user gridtank.
Reviewed-by: Tomas Härdin
5 years agocmdutils: Ask for a sample in case a odd rotation angle is encountered
Michael Niedermayer [Mon, 4 May 2015 15:33:40 +0000 (17:33 +0200)]
cmdutils: Ask for a sample in case a odd rotation angle is encountered

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: Use tracks[k]->stream instead of s->streams[k]
Michael Niedermayer [Mon, 4 May 2015 13:47:54 +0000 (15:47 +0200)]
avformat/matroskadec: Use tracks[k]->stream instead of s->streams[k]

The later is not correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroskadec: check s->streams[k] before using it
Andreas Cadhalpun [Sun, 3 May 2015 21:55:20 +0000 (23:55 +0200)]
matroskadec: check s->streams[k] before using it

This fixes a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1dec: Check chroma shift parameters
Michael Niedermayer [Mon, 4 May 2015 11:37:26 +0000 (13:37 +0200)]
avcodec/ffv1dec: Check chroma shift parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1dec: More completely check micro_version
Michael Niedermayer [Mon, 4 May 2015 11:33:16 +0000 (13:33 +0200)]
avcodec/ffv1dec: More completely check micro_version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1dec: Check quant table symbols more completely
Michael Niedermayer [Mon, 4 May 2015 11:25:31 +0000 (13:25 +0200)]
avcodec/ffv1dec: Check quant table symbols more completely

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroskadec: use uint64_t instead of int for index_scale
Andreas Cadhalpun [Sun, 3 May 2015 21:07:20 +0000 (23:07 +0200)]
matroskadec: use uint64_t instead of int for index_scale

index_scale is set to matroska->time_scale of type uint64_t.

When index_scale is int, the assignment can overflow and e.g. result
in index_scale = 0. This causes a floating point exception due to the
division by index_scale.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_filter: use get_rotation()
Michael Niedermayer [Sun, 3 May 2015 21:53:32 +0000 (23:53 +0200)]
ffmpeg_filter: use get_rotation()

This unifies the rotation extraction code between ffplay and ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay&cmdutils:Factor get_rotation() code out
Michael Niedermayer [Sun, 3 May 2015 21:49:16 +0000 (23:49 +0200)]
ffplay&cmdutils:Factor get_rotation() code out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ccaption_dec: correcting line breaks in cc
Anshul Maheshwari [Sun, 3 May 2015 13:07:40 +0000 (18:37 +0530)]
avcodec/ccaption_dec: correcting line breaks in cc

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: unify displaymatrix based rotation code
Michael Niedermayer [Sun, 3 May 2015 00:27:54 +0000 (02:27 +0200)]
ffplay: unify displaymatrix based rotation code

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopngdec: don't use AV_PIX_FMT_MONOBLACK for apng
Andreas Cadhalpun [Sun, 3 May 2015 18:36:20 +0000 (20:36 +0200)]
pngdec: don't use AV_PIX_FMT_MONOBLACK for apng

AV_PIX_FMT_MONOBLACK has the AV_PIX_FMT_FLAG_BITSTREAM flag, i.e.
linesize can be smaller than width.

Since x_offset is only check against the width, this can lead to
x_offset * bpp >= image_linesize.

In this case ptr could be set to a position outside the image_buf in
png_handle_row, leading to memory corruption and thus crashes.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopngdec: return correct error code from decode_frame_common
Andreas Cadhalpun [Sun, 3 May 2015 15:50:26 +0000 (17:50 +0200)]
pngdec: return correct error code from decode_frame_common

During the loop ret can get changed. Since it is not set on all failure
paths, decode_frame_common can return 0 even though an error occurred.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopngdec: check s->last_picture.f->data[0] before using it
Andreas Cadhalpun [Sun, 3 May 2015 14:21:39 +0000 (16:21 +0200)]
pngdec: check s->last_picture.f->data[0] before using it

This check was removed in commit 08aec6f6, but
s->last_picture.f->data[0] is still used in handle_p_frame_apng
unconditionally.

This fixes a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wavpack: Check L/R values before use to avoid harmless integer overflow and...
Michael Niedermayer [Sun, 3 May 2015 13:54:21 +0000 (15:54 +0200)]
avcodec/wavpack: Check L/R values before use to avoid harmless integer overflow and undefined behavior in fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: Avoid division by 0
Michael Niedermayer [Sun, 3 May 2015 14:14:55 +0000 (16:14 +0200)]
avutil/opt: Avoid division by 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/avf_showcqt: optimize gamma calculation
Muhammad Faiz [Fri, 1 May 2015 09:44:59 +0000 (16:44 +0700)]
avfilter/avf_showcqt: optimize gamma calculation

benchmark (on intel core2 duo, gcc 4.9.1)
input samples duration 00:03:39.59
command: time -p ffmpeg -f f32le -ac 2 -ar 44100 -i input.pcm \
         -filter_complex showcqt=fullhd=0:gamma=$gamma \
         -f rawvideo -y /dev/null
gamma  previous  modified
  1    48.49 s   45.38 s
  2    49.33 s   48.11 s
  3    80.86 s   59.80 s
  4    80.84 s   51.25 s
  5    80.75 s   61.06 s
  6    80.93 s   61.80 s
  7    80.03 s   61.56 s

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/nvenc: Make pix_fmts_nvenc const
Michael Niedermayer [Sat, 2 May 2015 13:00:35 +0000 (15:00 +0200)]
avcodec/nvenc: Make pix_fmts_nvenc const

Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffv1dec: plane_index is 1 in case of version 4 gray+alpha.
Jérôme Martinez [Sat, 2 May 2015 11:23:12 +0000 (13:23 +0200)]
ffv1dec: plane_index is 1 in case of version 4 gray+alpha.

Since version 4, plane_index for the alpha plane is 1 in the case chroma_planes is 0.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoLICENSE.md: add *_rect filters
Michael Niedermayer [Sat, 2 May 2015 23:43:30 +0000 (01:43 +0200)]
LICENSE.md: add *_rect filters

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: prepend avfilter_deps for *_rect filters
Michael Niedermayer [Sat, 2 May 2015 23:42:51 +0000 (01:42 +0200)]
configure: prepend avfilter_deps for *_rect filters

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da'
Michael Niedermayer [Sat, 2 May 2015 23:29:41 +0000 (01:29 +0200)]
Merge commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da'

* commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da':
  configure: Allow log2 with MSVC 2013 onwards.

Conflicts:
configure

See: 4d93e758d732726fa7e20693db1f447985f1d6d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '863ee06809b215895ee20cbc557eeceb904cf770'
Michael Niedermayer [Sat, 2 May 2015 23:20:24 +0000 (01:20 +0200)]
Merge commit '863ee06809b215895ee20cbc557eeceb904cf770'

* commit '863ee06809b215895ee20cbc557eeceb904cf770':
  configure: Use the right local variable in the MSVC and ICL probes

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f'
Michael Niedermayer [Sat, 2 May 2015 23:04:14 +0000 (01:04 +0200)]
Merge commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f'

* commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f':
  avprobe: Print the display matrix from per-stream sidedata

Conflicts:
avprobe.c

See: 08152f2df2c894dea22960572fe0bd9157cb52a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffprobe: support printing AVStream and AVPacket side data
Michael Niedermayer [Sat, 2 May 2015 22:40:50 +0000 (00:40 +0200)]
ffprobe: support printing AVStream and AVPacket side data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffprobe: Add Support to print information about AV_FRAME_DATA_DISPLAYMATRIX
Michael Niedermayer [Sat, 2 May 2015 22:39:08 +0000 (00:39 +0200)]
ffprobe: Add Support to print information about AV_FRAME_DATA_DISPLAYMATRIX

Idea from 709e1c91ea7a5bbf2b9a104642572ca7616b224f by Martin Storsjö
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffprobe: add writer_print_integers() to allow printing formated 1d and 2d arrays...
Michael Niedermayer [Sat, 2 May 2015 21:45:00 +0000 (23:45 +0200)]
ffprobe: add writer_print_integers() to allow printing formated 1d and 2d arrays of integers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3080b0497ddf8549d86ee99b79ac0c15f44ee382'
Michael Niedermayer [Sat, 2 May 2015 21:43:51 +0000 (23:43 +0200)]
Merge commit '3080b0497ddf8549d86ee99b79ac0c15f44ee382'

* commit '3080b0497ddf8549d86ee99b79ac0c15f44ee382':
  avprobe: Support writing arrays of integers without keys

Conflicts:
avprobe.c

Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: remove rotate metadata in case of autorotate
Michael Niedermayer [Sat, 2 May 2015 21:04:00 +0000 (23:04 +0200)]
ffmpeg_opt: remove rotate metadata in case of autorotate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'
Michael Niedermayer [Sat, 2 May 2015 20:39:00 +0000 (22:39 +0200)]
Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'

* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2':
  avconv: Add an option for automatically rotating video according to display matrix

Conflicts:
Changelog
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37'
Michael Niedermayer [Sat, 2 May 2015 20:21:28 +0000 (22:21 +0200)]
Merge commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37'

* commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37':
  avplay: Add support for rotated video

Conflicts:
configure
doc/ffplay.texi
ffplay.c

See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '21180b73239c6360aa28496d4879713b7ba4a8e5'
Michael Niedermayer [Sat, 2 May 2015 20:07:27 +0000 (22:07 +0200)]
Merge commit '21180b73239c6360aa28496d4879713b7ba4a8e5'

* commit '21180b73239c6360aa28496d4879713b7ba4a8e5':
  avplay: Factorize code for adding filters to the filter pipeline

Conflicts:
ffplay.c

See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: add forgotten avcodec/avformat deps for find/cover_rect
Michael Niedermayer [Sat, 2 May 2015 19:28:31 +0000 (21:28 +0200)]
configure: add forgotten avcodec/avformat deps for find/cover_rect

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: Add cover_rect filter
Michael Niedermayer [Sat, 2 May 2015 19:00:38 +0000 (21:00 +0200)]
avfilter: Add cover_rect filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: add find_rect filter
Michael Niedermayer [Sat, 2 May 2015 19:00:01 +0000 (21:00 +0200)]
avfilter: add find_rect filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Allow log2 with MSVC 2013 onwards.
Matt Oliver [Sun, 11 May 2014 07:40:20 +0000 (17:40 +1000)]
configure: Allow log2 with MSVC 2013 onwards.

Only MSVC 2010 in x64 mode, in the static msvcrt, had a
stray log2 function (which wasn't available in the headers).

MSVC 2013 has got a proper log2 function though.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoconfigure: Use the right local variable in the MSVC and ICL probes
Martin Storsjö [Thu, 5 Jun 2014 19:59:47 +0000 (22:59 +0300)]
configure: Use the right local variable in the MSVC and ICL probes

$cc is the compiler requested as main target compiler, while $_cc
is the actual tool tested in the probe function right now (which
can also be e.g. the host compiler).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavprobe: Print the display matrix from per-stream sidedata
Martin Storsjö [Wed, 29 Apr 2015 13:48:26 +0000 (16:48 +0300)]
avprobe: Print the display matrix from per-stream sidedata

This is printed in a separate subgroup "displaymatrix" inside a
new group named "sidedata". The subgroup has got two values,
"rotation" (which is the parsed rotation from the matrix) and
"matrix" containing the full actual values.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavprobe: Support writing arrays of integers without keys
Martin Storsjö [Sat, 2 May 2015 08:22:13 +0000 (11:22 +0300)]
avprobe: Support writing arrays of integers without keys

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavconv: Add an option for automatically rotating video according to display matrix
Martin Storsjö [Wed, 29 Apr 2015 14:59:01 +0000 (17:59 +0300)]
avconv: Add an option for automatically rotating video according to display matrix

The option is enabled by default, but can be disabled.

If this is enabled, such side data isn't copied into the output stream
(except when doing stream copy).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavplay: Add support for rotated video
Martin Storsjö [Wed, 29 Apr 2015 19:28:45 +0000 (22:28 +0300)]
avplay: Add support for rotated video

This is enabled by default, but can be disbled via the -noautorotate
option.

Based on a patch by Clément Bœsch.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavplay: Factorize code for adding filters to the filter pipeline
Martin Storsjö [Wed, 29 Apr 2015 19:24:48 +0000 (22:24 +0300)]
avplay: Factorize code for adding filters to the filter pipeline

Significantly based on a patch by Clément Bœsch.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolibavcodec/svq3: clarify unknown_flag by renaming to has_watermark
Michael Niedermayer [Sat, 2 May 2015 01:02:30 +0000 (03:02 +0200)]
libavcodec/svq3: clarify unknown_flag by renaming to has_watermark

The name is based on how the field is used in the code

Reviewed-by: compn <tempn@mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_libopencv: Make ocv_filter_entries const
Michael Niedermayer [Sat, 2 May 2015 13:02:01 +0000 (15:02 +0200)]
avfilter/vf_libopencv: Make ocv_filter_entries const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/cast5: Make iv array static
Michael Niedermayer [Sat, 2 May 2015 12:37:48 +0000 (14:37 +0200)]
avutil/cast5: Make iv array static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/cast5: Mark key_bits as const
Michael Niedermayer [Sat, 2 May 2015 12:37:08 +0000 (14:37 +0200)]
avutil/cast5: Mark key_bits as const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/dct-test: Use uint8_t for idct_simple_mmx_perm
Michael Niedermayer [Sat, 2 May 2015 11:43:15 +0000 (13:43 +0200)]
avcodec/x86/dct-test: Use uint8_t for idct_simple_mmx_perm

The table contains no element outside the unsigned 8bit range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/dct-test: Make static table const
Michael Niedermayer [Sat, 2 May 2015 11:42:46 +0000 (13:42 +0200)]
avcodec/x86/dct-test: Make static table const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: Mark static tables as const
Michael Niedermayer [Sat, 2 May 2015 11:27:18 +0000 (13:27 +0200)]
avformat/matroskadec: Mark static tables as const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/http: support HTTPS when listening
Rodger Combs [Sat, 2 May 2015 07:07:29 +0000 (02:07 -0500)]
lavf/http: support HTTPS when listening

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/svq3: Print unknown fields at debug level
Michael Niedermayer [Sat, 2 May 2015 00:58:00 +0000 (02:58 +0200)]
avcodec/svq3: Print unknown fields at debug level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'rbultje/vp9-profile1-wip'
Michael Niedermayer [Fri, 1 May 2015 20:23:37 +0000 (22:23 +0200)]
Merge remote-tracking branch 'rbultje/vp9-profile1-wip'

* rbultje/vp9-profile1-wip:
  vp9: add fate test for 422.
  vp9: copy bug in libvpx for 4:2:2 chroma bs=8x4/4x4 prediction.
  vp9: add yuv440 fate test.
  vp9: fix mask_edges and filter_plane_rows/cols() for 440.
  vp9: more specifically specify mask destination to mask_edges().
  vp9: add fate test for profile 1 444.
  vp9: don't create special u/v filter masks for 444.
  vp9: merge uv loopfilter code into generic filter_plane_rows/cols().
  vp9: split out loopfilter luma rows/cols functions from loopfilter_sb().
  vp9: invert order of two conditions.
  vp9: use correct chroma subsampling for profile 1 inter block recon.
  vp9: use correct chroma subsampling for profile 1 intra block recon.
  vp9: take chroma subsampling into account when walking the block tree.
  vp9: support non-420 chroma subsampling for profile 1 token decoding.
  vp9: increase buffer sizes for non-420 chroma subsamplings.
  vp9: profile 1 header decoding.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3ecb82dd4110108244373f007710df4c2ae572b6'
Michael Niedermayer [Fri, 1 May 2015 19:52:04 +0000 (21:52 +0200)]
Merge commit '3ecb82dd4110108244373f007710df4c2ae572b6'

* commit '3ecb82dd4110108244373f007710df4c2ae572b6':
  dnxhddec: Fix pixel format change

See: dcac15a84c8fc087ec85b2172db13d2e0d543e50
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6503cbf842a026faec517eb980551089168c7d8a'
Michael Niedermayer [Fri, 1 May 2015 19:34:35 +0000 (21:34 +0200)]
Merge commit '6503cbf842a026faec517eb980551089168c7d8a'

* commit '6503cbf842a026faec517eb980551089168c7d8a':
  ffv1enc: Add const attribute to input frame

Conflicts:
libavcodec/ffv1.h

no change, the changed field does not exist in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodnxhddec: Fix pixel format change
Carl Eugen Hoyos [Wed, 29 Apr 2015 16:18:37 +0000 (17:18 +0100)]
dnxhddec: Fix pixel format change

Regression introduced in 598f7d046cbf306706623210c5baafa3b7cd1df3.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoffv1enc: Add const attribute to input frame
Vittorio Giovara [Wed, 29 Apr 2015 15:35:43 +0000 (16:35 +0100)]
ffv1enc: Add const attribute to input frame

warning: assigning to 'AVFrame *' (aka 'struct AVFrame *') from
         'const AVFrame *' (aka 'const struct AVFrame *') discards
         qualifiers [-Wincompatible-pointer-types-discards-qualifiers]

5 years agoavcodec/h264: Remove failure on data partitioning
Michael Niedermayer [Fri, 1 May 2015 10:28:40 +0000 (12:28 +0200)]
avcodec/h264: Remove failure on data partitioning

decode all NAL units instead

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>