ffmpeg.git
6 years agoswscale: added proper error check for ff_init_filters
Pedro Arthur [Fri, 4 Sep 2015 21:09:20 +0000 (18:09 -0300)]
swscale: added proper error check for ff_init_filters

6 years agolavc/mxfdec: Support more mxf files with codec_ul.
Carl Eugen Hoyos [Fri, 4 Sep 2015 21:50:34 +0000 (23:50 +0200)]
lavc/mxfdec: Support more mxf files with codec_ul.

Fixes decoding for the sample from ticket #4820.

6 years agolavc/j2kenc: Remove experimental flag.
Carl Eugen Hoyos [Fri, 4 Sep 2015 21:48:32 +0000 (23:48 +0200)]
lavc/j2kenc: Remove experimental flag.

The encoder produces valid and - if requested - lossless files.

6 years agoavfilter/vf_vectorscope: change intensity to float
Paul B Mahol [Fri, 4 Sep 2015 18:47:46 +0000 (18:47 +0000)]
avfilter/vf_vectorscope: change intensity to float

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_waveform: stop abusing s->size for calculating limit
Paul B Mahol [Fri, 4 Sep 2015 17:34:23 +0000 (17:34 +0000)]
avfilter/vf_waveform: stop abusing s->size for calculating limit

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_waveform: change intensity to float
Paul B Mahol [Fri, 4 Sep 2015 17:14:32 +0000 (17:14 +0000)]
avfilter/vf_waveform: change intensity to float

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_waveform: reduce number of operations a little
Paul B Mahol [Thu, 3 Sep 2015 14:21:52 +0000 (14:21 +0000)]
avfilter/vf_waveform: reduce number of operations a little

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_waveform: 9 and 10 bit depth support for lowpass & color filter
Paul B Mahol [Thu, 3 Sep 2015 13:53:05 +0000 (13:53 +0000)]
avfilter/vf_waveform: 9 and 10 bit depth support for lowpass & color filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovp9_parse: fix parsing of pskip and profile 2/3.
Ronald S. Bultje [Fri, 4 Sep 2015 13:59:17 +0000 (09:59 -0400)]
vp9_parse: fix parsing of pskip and profile 2/3.

The fate results change because we now correctly timestamp the pskip
frames, which means the results are now identical to -vsync 0.

6 years agolibvpxdec: explicitly signal RGB.
Ronald S. Bultje [Thu, 3 Sep 2015 13:32:46 +0000 (09:32 -0400)]
libvpxdec: explicitly signal RGB.

6 years agovp9: don't erase values for {lf,ref,skip,q}_enabled if segmentation=0.
Ronald S. Bultje [Thu, 3 Sep 2015 00:36:37 +0000 (20:36 -0400)]
vp9: don't erase values for {lf,ref,skip,q}_enabled if segmentation=0.

Instead, use segmentation.enabled before accessing each of these values.

6 years agovp9: fix segmentation map retention across keyframe boundaries.
Ronald S. Bultje [Wed, 2 Sep 2015 21:56:08 +0000 (17:56 -0400)]
vp9: fix segmentation map retention across keyframe boundaries.

6 years agovp9: fix RGB chroma subsampling.
Ronald S. Bultje [Wed, 2 Sep 2015 20:47:51 +0000 (16:47 -0400)]
vp9: fix RGB chroma subsampling.

6 years agovp9: read reserved bit in RGB header.
Ronald S. Bultje [Wed, 2 Sep 2015 18:35:03 +0000 (14:35 -0400)]
vp9: read reserved bit in RGB header.

6 years agovp9: clip intermediates in dequant calculations.
Ronald S. Bultje [Wed, 2 Sep 2015 17:47:22 +0000 (13:47 -0400)]
vp9: clip intermediates in dequant calculations.

This makes values consistent with libvpx.

6 years agovp9: fix segmentation map retention if segmentation is turned off.
Ronald S. Bultje [Wed, 2 Sep 2015 16:21:12 +0000 (12:21 -0400)]
vp9: fix segmentation map retention if segmentation is turned off.

6 years agovp9: use resetctx in the same way as libvpx.
Ronald S. Bultje [Wed, 2 Sep 2015 16:20:29 +0000 (12:20 -0400)]
vp9: use resetctx in the same way as libvpx.

6 years agovp9: fix indentation.
Ronald S. Bultje [Wed, 2 Sep 2015 16:20:10 +0000 (12:20 -0400)]
vp9: fix indentation.

6 years agovp9: deal with the case where update_map=0 but we're key/intraonly.
Ronald S. Bultje [Wed, 2 Sep 2015 15:26:24 +0000 (11:26 -0400)]
vp9: deal with the case where update_map=0 but we're key/intraonly.

6 years agovp9: reset segmentation information on context reset.
Ronald S. Bultje [Tue, 1 Sep 2015 20:44:10 +0000 (16:44 -0400)]
vp9: reset segmentation information on context reset.

6 years agoavcodec/g2meet: Also clear tile dimensions on header_fail
Michael Niedermayer [Fri, 4 Sep 2015 10:11:46 +0000 (12:11 +0200)]
avcodec/g2meet: Also clear tile dimensions on header_fail

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/g2meet: Fix potential overflow in tile dimensions check
Michael Niedermayer [Fri, 4 Sep 2015 10:10:02 +0000 (12:10 +0200)]
avcodec/g2meet: Fix potential overflow in tile dimensions check

Fixes CID1322351

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/eatgq: Check init_get_bits8() for failure
Michael Niedermayer [Fri, 4 Sep 2015 09:53:38 +0000 (11:53 +0200)]
avcodec/eatgq: Check init_get_bits8() for failure

Fixes CID1322315

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/adpcm: Check init_get_bits8() for failure
Michael Niedermayer [Fri, 4 Sep 2015 09:47:38 +0000 (11:47 +0200)]
avcodec/adpcm: Check init_get_bits8() for failure

Fixes CID1322317

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoffmpeg: Drop redundant ist check
Michael Niedermayer [Fri, 4 Sep 2015 09:42:23 +0000 (11:42 +0200)]
ffmpeg: Drop redundant ist check

stream copy always has a input stream, it cannot use complex video/audio filters with unambigous input
Fixes CID1322348

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agodoc/examples/http_multiclient: Fix occured typo
Michael Niedermayer [Fri, 4 Sep 2015 09:30:25 +0000 (11:30 +0200)]
doc/examples/http_multiclient: Fix occured typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/libfdk-aacdec: Remove unused variable
Michael Niedermayer [Fri, 4 Sep 2015 09:26:14 +0000 (11:26 +0200)]
avcodec/libfdk-aacdec: Remove unused variable

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/hevc_parser: Check init_get_bits8() for failure
Michael Niedermayer [Fri, 4 Sep 2015 01:09:03 +0000 (03:09 +0200)]
avcodec/hevc_parser: Check init_get_bits8() for failure

Fixes: CID1322322

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/ira288: Check init_get_bits8() for failure
Michael Niedermayer [Thu, 3 Sep 2015 23:18:13 +0000 (01:18 +0200)]
avcodec/ira288: Check init_get_bits8() for failure

Fixes: CID1322321

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/smacker: Check init_get_bits8() for failure
Michael Niedermayer [Thu, 3 Sep 2015 23:18:13 +0000 (01:18 +0200)]
avcodec/smacker: Check init_get_bits8() for failure

Fixes: CID1322314

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/sonic: Check init_get_bits8() for failure
Michael Niedermayer [Thu, 3 Sep 2015 23:18:13 +0000 (01:18 +0200)]
avcodec/sonic: Check init_get_bits8() for failure

Fixes: CID1322310

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/svq1dec: Check init_get_bits8() for failure
Michael Niedermayer [Thu, 3 Sep 2015 23:18:13 +0000 (01:18 +0200)]
avcodec/svq1dec: Check init_get_bits8() for failure

Fixes: CID1322313

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/tta: Check init_get_bits8() for failure
Michael Niedermayer [Thu, 3 Sep 2015 23:18:13 +0000 (01:18 +0200)]
avcodec/tta: Check init_get_bits8() for failure

Fixes: CID1322319

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/vp3: Check init_get_bits8() for failure
Michael Niedermayer [Thu, 3 Sep 2015 23:13:05 +0000 (01:13 +0200)]
avcodec/vp3: Check init_get_bits8() for failure

Fixes CID1322316

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter/af_channelmap: Reorder operations to avoid memleak
Michael Niedermayer [Thu, 3 Sep 2015 22:10:41 +0000 (00:10 +0200)]
avfilter/af_channelmap: Reorder operations to avoid memleak

Fixes CID1322346
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter/af_sidechaincompress: Also assert that i < 2
Michael Niedermayer [Thu, 3 Sep 2015 21:13:24 +0000 (23:13 +0200)]
avfilter/af_sidechaincompress: Also assert that i < 2

This should help static analyzers (CID1322339)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter/vf_atadenoise: Check for ff_get_video_buffer() failure
Michael Niedermayer [Thu, 3 Sep 2015 21:07:43 +0000 (23:07 +0200)]
avfilter/vf_atadenoise: Check for ff_get_video_buffer() failure

Fixes CID1322338

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter/vf_histogram: Fix order of operations with flags
Michael Niedermayer [Thu, 3 Sep 2015 21:02:03 +0000 (23:02 +0200)]
avfilter/vf_histogram: Fix order of operations with flags

Fixes CID1322325

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/gsmdec_template: avoid undefined negative left shifts
Michael Niedermayer [Thu, 3 Sep 2015 19:58:59 +0000 (21:58 +0200)]
avcodec/gsmdec_template: avoid undefined negative left shifts

Fixes: unknown_unknown_338_824_cov_1045285351_sample-gsm-8000.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/mov: Change the type of the r/g/b variables
Michael Niedermayer [Thu, 3 Sep 2015 19:54:44 +0000 (21:54 +0200)]
avformat/mov: Change the type of the r/g/b variables

Fixes integer overflow
Fixes: unknown_unknown_31b_795_cov_1818643045_raybauduc.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agolavf/http: Remove superfluous parenthesis.
Stephan Holljes [Thu, 3 Sep 2015 13:56:12 +0000 (15:56 +0200)]
lavf/http: Remove superfluous parenthesis.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter/avf_showwaves: Check max_samples
Michael Niedermayer [Thu, 3 Sep 2015 12:52:18 +0000 (14:52 +0200)]
avfilter/avf_showwaves: Check max_samples

Fixes potential division by zero
Fixes: CID1292295

Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agolavf/http: Fix incorrectly placed parenthesis.
Stephan Holljes [Thu, 3 Sep 2015 13:55:10 +0000 (15:55 +0200)]
lavf/http: Fix incorrectly placed parenthesis.

The assignment had incorrectly placed parentheses which resulted in ret
always being > 0.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter/af_dynaudnorm: Fix typo in assert
Michael Niedermayer [Thu, 3 Sep 2015 12:42:40 +0000 (14:42 +0200)]
avfilter/af_dynaudnorm: Fix typo in assert

Fixes: CID1322303

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter/avf_showfreqs: Use floating point division in WFUNC_BHANN
Michael Niedermayer [Thu, 3 Sep 2015 12:39:08 +0000 (14:39 +0200)]
avfilter/avf_showfreqs: Use floating point division in WFUNC_BHANN

Fixes: CID1322365

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/concatdec: Check file variable before dereferencing
Michael Niedermayer [Thu, 3 Sep 2015 11:35:37 +0000 (13:35 +0200)]
avformat/concatdec: Check file variable before dereferencing

Fixes CID1322328

Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoAAC: MIPS: Add missing codebooks in quantize funcs
Claudio Freire [Thu, 3 Sep 2015 13:49:17 +0000 (10:49 -0300)]
AAC: MIPS: Add missing codebooks in quantize funcs

Add entries on the quantize function tables for the missing
codebooks (which all behave like ZERO)

6 years agoAAC: Increase fuzziness of fate-aac tests
Claudio Freire [Thu, 3 Sep 2015 13:16:33 +0000 (10:16 -0300)]
AAC: Increase fuzziness of fate-aac tests

Needed to make them pass in mips

6 years agodoc: Explain how to use the fps and the fieldmatch filter together.
Carl Eugen Hoyos [Thu, 3 Sep 2015 12:36:34 +0000 (14:36 +0200)]
doc: Explain how to use the fps and the fieldmatch filter together.

Fixes ticket #3968.

6 years agoavformat/file: Fix copy and paste error
Michael Niedermayer [Thu, 3 Sep 2015 10:40:12 +0000 (12:40 +0200)]
avformat/file: Fix copy and paste error

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter/vf_sab: use the name 's' for the pointer to the private context
Ganesh Ajjanagadde [Tue, 1 Sep 2015 15:10:04 +0000 (08:10 -0700)]
avfilter/vf_sab: use the name 's' for the pointer to the private context

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
6 years agoavcodec/fraps: use init_get_bits8()
Paul B Mahol [Thu, 3 Sep 2015 09:40:49 +0000 (09:40 +0000)]
avcodec/fraps: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/hlsenc: Fix memleak of path
Michael Niedermayer [Thu, 3 Sep 2015 09:18:10 +0000 (11:18 +0200)]
avformat/hlsenc: Fix memleak of path

Fixes: CID1322343
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/hlsenc: Initialize vtt_oc to help static analyzers
Michael Niedermayer [Thu, 3 Sep 2015 09:14:48 +0000 (11:14 +0200)]
avformat/hlsenc: Initialize vtt_oc to help static analyzers

This is also more robust in case it ever is used

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/latmenc: Add assert to avoid coverity warning
Michael Niedermayer [Thu, 3 Sep 2015 08:37:13 +0000 (10:37 +0200)]
avformat/latmenc: Add assert to avoid coverity warning

Fixes CID1322323

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter/vf_drawgraph: add rscroll slide mode
Paul B Mahol [Wed, 2 Sep 2015 06:06:02 +0000 (06:06 +0000)]
avfilter/vf_drawgraph: add rscroll slide mode

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/vorbisdec: use init_get_bits8()
Paul B Mahol [Tue, 1 Sep 2015 15:53:56 +0000 (15:53 +0000)]
avcodec/vorbisdec: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_vectorscope: constify more variables
Paul B Mahol [Wed, 2 Sep 2015 09:11:52 +0000 (09:11 +0000)]
avfilter/vf_vectorscope: constify more variables

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_vectorscope: support more formats for color4 mode in common case
Paul B Mahol [Wed, 2 Sep 2015 08:48:25 +0000 (08:48 +0000)]
avfilter/vf_vectorscope: support more formats for color4 mode in common case

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_elbg: make it possible to output to pal8 pixel format
Paul B Mahol [Mon, 31 Aug 2015 12:38:24 +0000 (12:38 +0000)]
avfilter/vf_elbg: make it possible to output to pal8 pixel format

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/swfdec: Check return value of init_get_bits8()
Michael Niedermayer [Thu, 3 Sep 2015 07:47:39 +0000 (09:47 +0200)]
avformat/swfdec: Check return value of init_get_bits8()

Fixes: CID1322320

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoswresample/swresample: Fix integer overflow in seed calculation
Michael Niedermayer [Thu, 3 Sep 2015 07:22:31 +0000 (09:22 +0200)]
swresample/swresample: Fix integer overflow in seed calculation

Fixes CID1322333

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/mov: Fix integer overflow in FFABS
Michael Niedermayer [Thu, 3 Sep 2015 07:20:23 +0000 (09:20 +0200)]
avformat/mov: Fix integer overflow in FFABS

Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavutil/common: Add FFNABS()
Michael Niedermayer [Thu, 3 Sep 2015 00:17:24 +0000 (02:17 +0200)]
avutil/common: Add FFNABS()

This macro avoids the undefined corner case with the *_MIN values

Previous version Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/dump: Fix integer overflow in aspect ratio calculation
Michael Niedermayer [Thu, 3 Sep 2015 00:49:44 +0000 (02:49 +0200)]
avformat/dump: Fix integer overflow in aspect ratio calculation

Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavutil/common: Document FFABS() corner case
Michael Niedermayer [Thu, 3 Sep 2015 00:00:05 +0000 (02:00 +0200)]
avutil/common: Document FFABS() corner case

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agolavf: add V as a video stream specifier which is not an attached picture
Marton Balint [Mon, 31 Aug 2015 19:22:46 +0000 (21:22 +0200)]
lavf: add V as a video stream specifier which is not an attached picture

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoavcodec/mpeg12dec: Fix integer overflow
Michael Niedermayer [Wed, 2 Sep 2015 19:11:07 +0000 (21:11 +0200)]
avcodec/mpeg12dec: Fix integer overflow

Fixes: signal_sigabrt_7ffff6ac8cc9_686_cov_1897408623_microsoft_new_way_to_shove_mpeg2_in_asf.dvr_ms

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/mpegvideo: change bit_rate to 64bit
Michael Niedermayer [Wed, 2 Sep 2015 19:02:31 +0000 (21:02 +0200)]
avcodec/mpegvideo: change bit_rate to 64bit

32bit is not sufficient for all cases

Fixes: signal_sigabrt_7ffff6ac8cc9_686_cov_1897408623_microsoft_new_way_to_shove_mpeg2_in_asf.dvr_ms

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/mpegvideo_parser: Fix integer overflow
Michael Niedermayer [Wed, 2 Sep 2015 18:54:42 +0000 (20:54 +0200)]
avcodec/mpegvideo_parser: Fix integer overflow

Fixes: signal_sigabrt_7ffff6ac8cc9_686_cov_1897408623_microsoft_new_way_to_shove_mpeg2_in_asf.dvr_ms

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/truemotion1: Fix undefined behavior (left shift of negative value)
Michael Niedermayer [Wed, 2 Sep 2015 18:43:25 +0000 (20:43 +0200)]
avcodec/truemotion1: Fix undefined behavior (left shift of negative value)

Fixes: asan_heap-oob_26f6853_862_cov_585961513_sonic3dblast_intro-partial.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec: loongson optimize mpeg2 dct unquantize intra and denoise dct
周晓勇 [Wed, 2 Sep 2015 10:01:00 +0000 (18:01 +0800)]
avcodec: loongson optimize mpeg2 dct unquantize intra and denoise dct

Change-Id: I2f391ae912a079fb32f0703841dca86358aac72a
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agolavfi/colormatrix: Add a bt601 alias
Vittorio Giovara [Wed, 2 Sep 2015 13:05:29 +0000 (15:05 +0200)]
lavfi/colormatrix: Add a bt601 alias

Matches what av_get_colorspace_name() and av_color_space_name() report.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoffmpeg: Improve help text for -target.
Carl Eugen Hoyos [Wed, 2 Sep 2015 12:32:06 +0000 (14:32 +0200)]
ffmpeg: Improve help text for -target.

Fixes ticket #1057.

6 years agoavcodec/mips/aaccoder_mips: disable optimizatios which break fate-aac-pns-encode
Michael Niedermayer [Wed, 2 Sep 2015 10:39:38 +0000 (12:39 +0200)]
avcodec/mips/aaccoder_mips: disable optimizatios which break fate-aac-pns-encode

These should be re enabled once the issue is fixed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agofate: increase fuzziness for the AAC encoder prediction test
Rostislav Pehlivanov [Wed, 2 Sep 2015 07:36:53 +0000 (08:36 +0100)]
fate: increase fuzziness for the AAC encoder prediction test

Fails on x86_64 using ICC 13.1.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
6 years agofate: add fuzziness to the AAC Encode prediction test
Rostislav Pehlivanov [Wed, 2 Sep 2015 06:15:42 +0000 (07:15 +0100)]
fate: add fuzziness to the AAC Encode prediction test

Fails on ppc64 architecture under Ubuntu.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
6 years agofate: update AAC encoder tests
Rostislav Pehlivanov [Wed, 2 Sep 2015 05:39:59 +0000 (06:39 +0100)]
fate: update AAC encoder tests

TNS had both IS and PNS switched on when it makes more sense
to have them both off.

Prediction had a redundant argument.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
6 years agoaacenc: reorder coding tools
Rostislav Pehlivanov [Wed, 2 Sep 2015 05:26:45 +0000 (06:26 +0100)]
aacenc: reorder coding tools

This commit reorders the coding tools such that they're doing what
the decoder does in reverse order. The very first thing the decoder
does is to decode M/S stereo if that's signalled, then prediction,
IS, and finally TNS and PNS in another function.
adjust_frame_information()'s application of IS and M/S was taken
out into two separate functions since prediction doesn't expect
to get the raw coefficients but rathe the coefficients at that
part of the encoding process.

The results show a much better PSNR when any combination of
Intensity Stereo, Mid/Side stereo and Prediction is used, which
is a sign of an increased encoder efficiency as well as the fact
that the decoder gets what it expects.

Otherwise, with only IS, PNS or prediction there are neither
regressions nor improvements except in the case of IS, which
now by itself (or with PNS) is less prone to artifacts. Enabling
M/S (using stereo_mode) as well will also reduce stereo artifacts
induced by IS, so in the very near future M/S may be enabled
by default.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
6 years agoavformat/hlsenc: add a use_localtime option to expand the segment filename with localtime
LiuQi [Mon, 31 Aug 2015 20:10:15 +0000 (04:10 +0800)]
avformat/hlsenc: add a use_localtime option to expand the segment filename with localtime

test examples:

./ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -v verbose -c copy -f hls -hls_segment_filename test-%s.ts -use_localtime 1 -bsf:v h264_mp4toannexb aaa.m3u8

[StevenLiu@localhost ffmpeg]$ cat aaa.m3u8;ll test-*.ts
test-1441052221.ts
test-1441052231.ts
test-1441052235.ts
test-1441052243.ts
test-1441052249.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:15 test-1441052131.ts
-rw-r--r--  1 StevenLiu  staff   495192  9  1 04:15 test-1441052141.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:17 test-1441052212.ts
-rw-r--r--  1 StevenLiu  staff  1067840  9  1 04:17 test-1441052221.ts
-rw-r--r--  1 StevenLiu  staff   235564  9  1 04:17 test-1441052231.ts
-rw-r--r--  1 StevenLiu  staff  1187220  9  1 04:17 test-1441052235.ts
-rw-r--r--  1 StevenLiu  staff   694848  9  1 04:17 test-1441052243.ts
-rw-r--r--  1 StevenLiu  staff   526588  9  1 04:17 test-1441052249.ts
[StevenLiu@localhost ffmpeg]$

./ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -v verbose -c copy -f hls -hls_segment_filename test-%s.ts -use_localtime 1 -bsf:v h264_mp4toannexb aaa.m3u8

[StevenLiu@localhost ffmpeg]$ cat aaa.m3u8;ll aaa-*.ts
aaa-1441052417.ts
aaa-1441052427.ts
aaa-1441052437.ts
aaa-1441052440.ts
aaa-1441052449.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:19 aaa-1441052382.ts
-rw-r--r--  1 StevenLiu  staff   277300  9  1 04:19 aaa-1441052392.ts
-rw-r--r--  1 StevenLiu  staff  1310736  9  1 04:20 aaa-1441052417.ts
-rw-r--r--  1 StevenLiu  staff  1067840  9  1 04:20 aaa-1441052427.ts
-rw-r--r--  1 StevenLiu  staff   235564  9  1 04:20 aaa-1441052437.ts
-rw-r--r--  1 StevenLiu  staff  1187220  9  1 04:20 aaa-1441052440.ts
-rw-r--r--  1 StevenLiu  staff   338776  9  1 04:20 aaa-1441052449.ts
[StevenLiu@localhost ffmpeg]$

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/hevc_parser: fix split function of parser
Rainer Hochecker [Tue, 1 Sep 2015 14:27:02 +0000 (16:27 +0200)]
avcodec/hevc_parser: fix split function of parser

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/ffv1dec: Print CRCs at picture debug level
Michael Niedermayer [Wed, 2 Sep 2015 00:11:43 +0000 (02:11 +0200)]
avcodec/ffv1dec: Print CRCs at picture debug level

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/ffv1dec: Check that there is enough space for the CRC in the global header
Michael Niedermayer [Wed, 2 Sep 2015 00:10:31 +0000 (02:10 +0200)]
avcodec/ffv1dec: Check that there is enough space for the CRC in the global header

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavcodec/h264_slice: replace assert by normal error check
Michael Niedermayer [Tue, 1 Sep 2015 22:44:28 +0000 (00:44 +0200)]
avcodec/h264_slice: replace assert by normal error check

Fixes assertion failure
Fixes: c6075771557e4f3b7b74e63d2d24fb01/signal_sigabrt_7ffff6ac8cc9_133_cov_2853689970_CREDITS.FST

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agolavf/dv: Do not return EIO for every error (like EOF).
Carl Eugen Hoyos [Tue, 1 Sep 2015 22:58:13 +0000 (00:58 +0200)]
lavf/dv: Do not return EIO for every error (like EOF).

Fixes ticket #4818.

Reviewed-by: Ronald S. Bultje
Reviewed-by: Paul B Mahol
6 years agoavfilter/vf_subtitles: allow setting fonts directory
Ricardo Constantino [Sun, 30 Aug 2015 22:52:10 +0000 (23:52 +0100)]
avfilter/vf_subtitles: allow setting fonts directory

This is mostly useful if libass was compiled with a font provider
other than fontconfig, but is still useful in that case.

Signed-off-by: Ricardo Constantino <wiiaboo@gmail.com>
6 years agoavcodec/version: Minor version bump due to 5d12d7de2ce548a3c9f5c175a9d1c5bfbdbcbfa8
Michael Niedermayer [Tue, 1 Sep 2015 21:02:15 +0000 (23:02 +0200)]
avcodec/version: Minor version bump due to 5d12d7de2ce548a3c9f5c175a9d1c5bfbdbcbfa8

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavformat/mxg: Use memmove()
Michael Niedermayer [Tue, 1 Sep 2015 20:45:07 +0000 (22:45 +0200)]
avformat/mxg: Use memmove()

Fixes undefined behavior
Fixes: 1700002963a49da13542e0726b7bb758/unknown_unknown_292_658_cov_2141972066_m1.mxg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agompegts: demux BluRay text subtitles
Petri Hintukainen [Tue, 1 Sep 2015 08:56:21 +0000 (11:56 +0300)]
mpegts: demux BluRay text subtitles

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agompegts: fix demuxing PES private stream 2
Petri Hintukainen [Mon, 31 Aug 2015 09:06:16 +0000 (12:06 +0300)]
mpegts: fix demuxing PES private stream 2

PES header size is 6 bytes (00 00 01 bf XX XX), not 0.
BluRay text subtitles use private stream 2.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoavfilter/vf_spp: use the name 's' for the pointer to the private context
Ganesh Ajjanagadde [Mon, 31 Aug 2015 15:07:56 +0000 (08:07 -0700)]
avfilter/vf_spp: use the name 's' for the pointer to the private context

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
6 years agortmp: support the AMF_DATE tag
Andrew Stone [Tue, 1 Sep 2015 00:28:42 +0000 (20:28 -0400)]
rtmp: support the AMF_DATE tag

Instead of returning EINVAL, which can cause a stream to fail to load, this
allows the tag to be passed through to the flv demuxer, where it's summarily
ignored.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
6 years agoaacenc: disable bandtype modifying extensions when coder != twoloop
Rostislav Pehlivanov [Tue, 1 Sep 2015 11:07:00 +0000 (12:07 +0100)]
aacenc: disable bandtype modifying extensions when coder != twoloop

If the selected coder isn't twoloop, this commit temporarily
disables IS and PNS.
The problem is in the encode_window_bands_info() being confused
and setting invalid band_types for non-marked (normal) bands.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
6 years agoavfilter/vf_waveform: support envelope for all filters
Paul B Mahol [Mon, 31 Aug 2015 17:48:10 +0000 (17:48 +0000)]
avfilter/vf_waveform: support envelope for all filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_waveform: simplify memory allocations
Paul B Mahol [Mon, 31 Aug 2015 16:45:55 +0000 (16:45 +0000)]
avfilter/vf_waveform: simplify memory allocations

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_waveform: implement various filters
Paul B Mahol [Fri, 28 Aug 2015 18:45:53 +0000 (18:45 +0000)]
avfilter/vf_waveform: implement various filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofate: adjust fuzz of AAC Encoder's TNS test
Rostislav Pehlivanov [Tue, 1 Sep 2015 08:08:31 +0000 (09:08 +0100)]
fate: adjust fuzz of AAC Encoder's TNS test

Have to adjust it again, this time because of --enable-small on
gcc 4.5 in Linaro.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
6 years agolavf: Remove probesize32 and max_analyze_duration32 on version bump.
Carl Eugen Hoyos [Tue, 1 Sep 2015 07:19:49 +0000 (09:19 +0200)]
lavf: Remove probesize32 and max_analyze_duration32 on version bump.

Add FF_API_PROBESIZE_32 to allow removing 32bit probesize and 32bit
max_analyze_duration after the next libavformat version bump.

6 years agolavfi/scale: Pass src_range and dst_range to libswscale.
Carl Eugen Hoyos [Tue, 1 Sep 2015 07:17:26 +0000 (09:17 +0200)]
lavfi/scale: Pass src_range and dst_range to libswscale.

Fixes ticket #4812.

6 years agofate: update AAC tests to the new defaults
Rostislav Pehlivanov [Tue, 1 Sep 2015 06:26:03 +0000 (07:26 +0100)]
fate: update AAC tests to the new defaults

IS and PNS increase quality a ton so as a result the PSNR changed.
Disable the extensions and keep the tests separate such that there
will be no red herrings if one test fails.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>