ffmpeg.git
4 years agoMerge commit '910247f1720c6aae422723c05dac6d0b19f20bec'
Michael Niedermayer [Fri, 3 Jul 2015 01:40:22 +0000 (03:40 +0200)]
Merge commit '910247f1720c6aae422723c05dac6d0b19f20bec'

* commit '910247f1720c6aae422723c05dac6d0b19f20bec':
  lavc: Deprecate avctx.{inter,intra}_quant_bias

Conflicts:
libavcodec/mpegvideo_enc.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1316df7aa98c4784f190d107206d0bb12c590b89'
Michael Niedermayer [Fri, 3 Jul 2015 01:20:09 +0000 (03:20 +0200)]
Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'

* commit '1316df7aa98c4784f190d107206d0bb12c590b89':
  lavu: add an API function to return the Libav version string

Conflicts:
.gitignore
Makefile
cmdutils.c
doc/APIchanges
libavutil/avutil.h
libavutil/utils.c

See: f91126643a91c2d3f8d8e210c8facaf259951b03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc: Deprecate avctx.{inter,intra}_quant_bias
Vittorio Giovara [Thu, 2 Jul 2015 11:14:22 +0000 (12:14 +0100)]
lavc: Deprecate avctx.{inter,intra}_quant_bias

They are used by dnxhd and mpegvideo_enc exclusively, move them to codec
private options instead.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavu: add an API function to return the Libav version string
wm4 [Thu, 2 Jul 2015 17:04:59 +0000 (19:04 +0200)]
lavu: add an API function to return the Libav version string

This returns something like "v12_dev0-1332-g333a27c". This is much more
useful than the individual library versions, of which there are too
many, and which are very hard to map back to releases or git commits.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
4 years agoswscale: implement YA8 output
Paul B Mahol [Wed, 1 Jul 2015 19:40:26 +0000 (19:40 +0000)]
swscale: implement YA8 output

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agowavpack: limit extra_bits to 32 and use get_bits_long
Andreas Cadhalpun [Thu, 2 Jul 2015 21:05:05 +0000 (23:05 +0200)]
wavpack: limit extra_bits to 32 and use get_bits_long

More than 32 bits can't be stored in an integer and get_bits should not
be used with more than 25 bits.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavfilter/vf_mpdecimate: remove packed formats
Paul B Mahol [Thu, 2 Jul 2015 10:33:52 +0000 (10:33 +0000)]
avfilter/vf_mpdecimate: remove packed formats

Packed formats are not supported.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter: use AVFILTER_DEFINE_CLASS()
Paul B Mahol [Thu, 2 Jul 2015 09:49:26 +0000 (09:49 +0000)]
avfilter: use AVFILTER_DEFINE_CLASS()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/qsvenc_h264: Change the set of performance presets to match with the MFX...
Ivan Uskov [Thu, 2 Jul 2015 16:09:12 +0000 (19:09 +0300)]
avcodec/qsvenc_h264: Change the set of performance presets to match with the MFX library constants.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegdec: Reorder operations to avoid undefined behavior
Michael Niedermayer [Thu, 2 Jul 2015 16:53:17 +0000 (18:53 +0200)]
avcodec/mjpegdec: Reorder operations to avoid undefined behavior

Fixes: asan_heap-oob_1dd60fd_267_cov_2954683513_5baad44ca4702949724234e35c5bb341.jpg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/motion_est_template: Fix undefined shifts in CHECK_MV()
Michael Niedermayer [Thu, 2 Jul 2015 16:42:05 +0000 (18:42 +0200)]
avcodec/motion_est_template: Fix undefined shifts in CHECK_MV()

Fixes:asan_heap-oob_4d5bb0_2295_cov_3374722539_hotel_california_ra5.1_640x480_30s.rmvb

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/qsv: Extending QSV/MFX session initialization for the linux platform where...
Ivan Uskov [Tue, 30 Jun 2015 17:13:09 +0000 (20:13 +0300)]
avcodec/qsv: Extending QSV/MFX session initialization for the linux platform where a display handle is required.

Now ff_qsv_init_internal_session() is able
to find appropriate display handle under linux using VAAPI.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/muxers/segment: fix formatting of segment_list_type option
Stefano Sabatini [Thu, 2 Jul 2015 09:00:18 +0000 (11:00 +0200)]
doc/muxers/segment: fix formatting of segment_list_type option

Place @item entry at the right point, remove duplicated description.

4 years agoavformat/asfdec_f: Fix memleak
Michael Niedermayer [Thu, 2 Jul 2015 07:23:35 +0000 (09:23 +0200)]
avformat/asfdec_f: Fix memleak

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfdec_f: Add ASFDataType, use named types for metadata
John Adlum [Wed, 1 Jul 2015 22:15:13 +0000 (00:15 +0200)]
avformat/asfdec_f: Add ASFDataType, use named types for metadata

This is based on asfdec_o.c, but uses a proper type instead of defines

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfdec_f: Use dynamic allocation in asf_read_metadata() instead of a fixed...
John Adlum [Wed, 1 Jul 2015 21:46:30 +0000 (23:46 +0200)]
avformat/asfdec_f: Use dynamic allocation in asf_read_metadata() instead of a fixed size buffer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfdec_f: factor error checking out of main header parsing loop
John Adlum [Wed, 1 Jul 2015 21:21:53 +0000 (23:21 +0200)]
avformat/asfdec_f: factor error checking out of main header parsing loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_filter: log more information on failure to init simple filter graph
rogerdpack [Wed, 1 Jul 2015 19:23:55 +0000 (13:23 -0600)]
ffmpeg_filter: log more information on failure to init simple filter graph

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'
Michael Niedermayer [Wed, 1 Jul 2015 22:34:24 +0000 (00:34 +0200)]
Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'

* commit 'a31c4b2cbef9aee15910fc3df52519aef46760de':
  fate-g2m3: disable the audio stream

Conflicts:
tests/ref/fate/g2m3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Redesign scoring in av_find_default_stream_index()
Michael Niedermayer [Wed, 1 Jul 2015 20:35:07 +0000 (22:35 +0200)]
avformat/utils: Redesign scoring in av_find_default_stream_index()

This avoids empty streams from being selected if a equivalent non empty one is available
The new system is also clearer and more systematic
This may need finetuning, which should be easy to do ...

Fixes Ticket2687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Favor streams that had packets
Michael Niedermayer [Wed, 1 Jul 2015 20:19:53 +0000 (22:19 +0200)]
ffmpeg_opt: Favor streams that had packets

Fixes Thailand-Wave.wmv without explicitly specifying a stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtmpproto: increase hardcoded url/path lengths
Paul B Mahol [Wed, 1 Jul 2015 16:26:53 +0000 (16:26 +0000)]
avformat/rtmpproto: increase hardcoded url/path lengths

Fixes #4103.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agofate-g2m3: disable the audio stream
Janne Grunau [Wed, 1 Jul 2015 15:35:51 +0000 (17:35 +0200)]
fate-g2m3: disable the audio stream

The audio decoder is not in fate-g2m3 dependencies and the wma2 decoder
is probably not bit-exact since it it float based.

4 years agolavu: Makefile: skip atomic.c if native atomics are available
Rodger Combs [Wed, 1 Jul 2015 19:20:08 +0000 (14:20 -0500)]
lavu: Makefile: skip atomic.c if native atomics are available

This prevents a linker warning and skips a useless compilation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264dsp_template: Fix undefined shifts
Michael Niedermayer [Wed, 1 Jul 2015 18:38:57 +0000 (20:38 +0200)]
avcodec/h264dsp_template: Fix undefined shifts

Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mss2: Fix integer overflow
Michael Niedermayer [Wed, 1 Jul 2015 18:29:44 +0000 (20:29 +0200)]
avcodec/mss2: Fix integer overflow

This also simplifies the code
Fixes: signal_sigabrt_7ffff6ac8cc9_2943_cov_3588637614_mss2_speech.wmv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4e0819310e2d2eff60be2d6df28335f0739712b9'
Michael Niedermayer [Wed, 1 Jul 2015 17:44:30 +0000 (19:44 +0200)]
Merge commit '4e0819310e2d2eff60be2d6df28335f0739712b9'

* commit '4e0819310e2d2eff60be2d6df28335f0739712b9':
  elsdec: Replace EOVERFLOW with INVALIDDATA

See: dec728888f8826e3f2032aec463c3dd1e26ec2a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721'
Michael Niedermayer [Wed, 1 Jul 2015 17:18:04 +0000 (19:18 +0200)]
Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721'

* commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721':
  g2meet: force simple idct for identical results over all fate configs

Conflicts:
tests/ref/fate/g2m3
tests/ref/fate/g2m4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_extractplanes: use faster path for input formats with only one component
Paul B Mahol [Wed, 1 Jul 2015 17:12:07 +0000 (17:12 +0000)]
avfilter/vf_extractplanes: use faster path for input formats with only one component

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_extractplanes: rename misleading variable
Paul B Mahol [Wed, 1 Jul 2015 17:09:19 +0000 (17:09 +0000)]
avfilter/vf_extractplanes: rename misleading variable

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_extractplanes: support more pixel formats
Paul B Mahol [Wed, 1 Jul 2015 17:01:34 +0000 (17:01 +0000)]
avfilter/vf_extractplanes: support more pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a'
Michael Niedermayer [Wed, 1 Jul 2015 17:09:49 +0000 (19:09 +0200)]
Merge commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a'

* commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a':
  g2meet: use av_ceil_log2 instead of a custom function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75'
Michael Niedermayer [Wed, 1 Jul 2015 17:09:06 +0000 (19:09 +0200)]
Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75'

* commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75':
  g2meet: use an unsigned type for the djb hash

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '007e27d363ba7d994019dc897dc9c39071bb204a'
Michael Niedermayer [Wed, 1 Jul 2015 16:58:01 +0000 (18:58 +0200)]
Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a'

* commit '007e27d363ba7d994019dc897dc9c39071bb204a':
  avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()

Conflicts:
libavcodec/atrac3plusdec.c
libavcodec/sp5xdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfdec_f: Assert that packet positions match in asf_read_pts()
John Adlum [Wed, 1 Jul 2015 14:41:26 +0000 (16:41 +0200)]
avformat/asfdec_f: Assert that packet positions match in asf_read_pts()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfdec_f: Correct skip to key code
John Adlum [Wed, 1 Jul 2015 14:08:05 +0000 (16:08 +0200)]
avformat/asfdec_f: Correct skip to key code

Fixes Ticket3978

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pthread_frame: Correcting typo of "occurred"
John Adlum [Wed, 1 Jul 2015 15:12:49 +0000 (17:12 +0200)]
avcodec/pthread_frame: Correcting typo of "occurred"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions
Shivraj Patil [Mon, 29 Jun 2015 15:27:12 +0000 (20:57 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions in new file mpegvideo_msa.c

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoelsdec: Replace EOVERFLOW with INVALIDDATA
Michael Niedermayer [Wed, 1 Jul 2015 14:38:19 +0000 (15:38 +0100)]
elsdec: Replace EOVERFLOW with INVALIDDATA

EOVERFLOW is not available on all platforms.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_mvpred: Fix undefined shifts in MAP_F2F
Michael Niedermayer [Wed, 1 Jul 2015 13:43:50 +0000 (15:43 +0200)]
avcodec/h264_mvpred: Fix undefined shifts in MAP_F2F

Fixes: asan_heap-oob_17301a3_2100_cov_3226131691_ff_add_pixels_clamped_mmx.m2ts

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/motion_est: Fix some undefined shifts
Michael Niedermayer [Wed, 1 Jul 2015 13:41:29 +0000 (15:41 +0200)]
avcodec/motion_est: Fix some undefined shifts

Fixes: asan_heap-oob_1dd60fd_1049_cov_4200102444_P4250048.MOV

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agog2meet: force simple idct for identical results over all fate configs
Janne Grunau [Wed, 1 Jul 2015 13:33:20 +0000 (15:33 +0200)]
g2meet: force simple idct for identical results over all fate configs

4 years agolavu: add an API function to return the FFmpeg version string
wm4 [Tue, 30 Jun 2015 21:57:53 +0000 (23:57 +0200)]
lavu: add an API function to return the FFmpeg version string

This returns something like "N-73264-gb54ac84". This is much more useful
than the individual library versions, of which there are too much and
which are very hard to map back to releases or git commits.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/concatdec: copy stream metadata when using concat
Vadim Belov [Wed, 1 Jul 2015 10:49:06 +0000 (13:49 +0300)]
avformat/concatdec: copy stream metadata when using concat

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nutdec: Check ff_gen_search() for failure
Michael Niedermayer [Wed, 1 Jul 2015 12:28:41 +0000 (14:28 +0200)]
avformat/nutdec: Check ff_gen_search() for failure

Fixes assertion failure

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agog2meet: use av_ceil_log2 instead of a custom function
Janne Grunau [Wed, 1 Jul 2015 11:58:34 +0000 (13:58 +0200)]
g2meet: use av_ceil_log2 instead of a custom function

4 years agoavcodec/motion_est: Fix undefined shifts in cmp_inline()
Michael Niedermayer [Wed, 1 Jul 2015 11:41:26 +0000 (13:41 +0200)]
avcodec/motion_est: Fix undefined shifts in cmp_inline()

Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_enc: fix undefined shifts in ff_dct_quantize_c()
Michael Niedermayer [Wed, 1 Jul 2015 11:39:43 +0000 (13:39 +0200)]
avcodec/mpegvideo_enc: fix undefined shifts in ff_dct_quantize_c()

Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agog2meet: use an unsigned type for the djb hash
Janne Grunau [Wed, 1 Jul 2015 11:34:50 +0000 (13:34 +0200)]
g2meet: use an unsigned type for the djb hash

4 years agoavcodec/motion_est_template: Fix undefined shifts in CHECK_MV_DIR()
Michael Niedermayer [Wed, 1 Jul 2015 10:16:37 +0000 (12:16 +0200)]
avcodec/motion_est_template: Fix undefined shifts in CHECK_MV_DIR()

Fixes: signal_sigsegv_2e64ee0_2762_cov_4170502227_missing_frames.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()
Janne Grunau [Sun, 28 Jun 2015 12:58:47 +0000 (14:58 +0200)]
avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()

4 years agoavformat/matroskadec: Fix undefined shift in read_sint()
Michael Niedermayer [Wed, 1 Jul 2015 09:59:57 +0000 (11:59 +0200)]
avformat/matroskadec: Fix undefined shift in read_sint()

Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Fix forcing fourccs
Michael Niedermayer [Wed, 1 Jul 2015 03:10:51 +0000 (05:10 +0200)]
ffmpeg_opt: Fix forcing fourccs

Fixes Ticket4682

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/elsdec: Remove EOVERFLOW
Michael Niedermayer [Wed, 1 Jul 2015 02:24:58 +0000 (04:24 +0200)]
avcodec/elsdec: Remove EOVERFLOW

EOVERFLOW is not available on all platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'
Michael Niedermayer [Wed, 1 Jul 2015 02:15:27 +0000 (04:15 +0200)]
Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'

* commit 'a1e2caa93e4f8102666a21222f01b74838b6497f':
  mov: Log format rather than fourcc in stsd in trace mode

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'
Michael Niedermayer [Wed, 1 Jul 2015 02:05:45 +0000 (04:05 +0200)]
Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'

* commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1':
  mov: Adjust variable types to fix format warnings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'df22e30172b09cda4d6f7d4f43508284be65848a'
Michael Niedermayer [Wed, 1 Jul 2015 01:49:52 +0000 (03:49 +0200)]
Merge commit 'df22e30172b09cda4d6f7d4f43508284be65848a'

* commit 'df22e30172b09cda4d6f7d4f43508284be65848a':
  dump: Use the correct abs() version

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'
Michael Niedermayer [Wed, 1 Jul 2015 01:40:45 +0000 (03:40 +0200)]
Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'

* commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6':
  lavfi: Add library identifier

Conflicts:
libavfilter/version.h

See: a70b4935f1867797b62312c20035025fad8b1f94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0f87f9b4fceee854f09da2d1ef329245196775f8'
Michael Niedermayer [Wed, 1 Jul 2015 01:37:59 +0000 (03:37 +0200)]
Merge commit '0f87f9b4fceee854f09da2d1ef329245196775f8'

* commit '0f87f9b4fceee854f09da2d1ef329245196775f8':
  lavd: Add library identifier

Conflicts:
libavdevice/version.h

See: a70b4935f1867797b62312c20035025fad8b1f94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e'
Michael Niedermayer [Wed, 1 Jul 2015 01:36:21 +0000 (03:36 +0200)]
Merge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e'

* commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e':
  lavc: Add missing API guard to dtg_active_format option

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008'
Michael Niedermayer [Wed, 1 Jul 2015 01:22:33 +0000 (03:22 +0200)]
Merge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008'

* commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008':
  g2meet: Add FATE tests for all three G2M variants

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'
Michael Niedermayer [Wed, 1 Jul 2015 01:18:30 +0000 (03:18 +0200)]
Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'

* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
  Go2Meeting decoder

Conflicts:
Changelog
libavcodec/g2meet.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'
Michael Niedermayer [Wed, 1 Jul 2015 01:03:20 +0000 (03:03 +0200)]
Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'

* commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c':
  fate: Avoid unnecessary pixel format conversions

Conflicts:
tests/fate/image.mak
tests/ref/fate/dds-ya

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/aacsbr: Assert that bs_num_env is positive
Michael Niedermayer [Wed, 1 Jul 2015 00:08:25 +0000 (02:08 +0200)]
avcodec/aacsbr: Assert that bs_num_env is positive

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/aacsbr: check that the element type matches before applying SBR
Michael Niedermayer [Wed, 1 Jul 2015 00:05:43 +0000 (02:05 +0200)]
avcodec/aacsbr: check that the element type matches before applying SBR

Fixes out of array access
Fixes: signal_sigsegv_3670fc0_2818_cov_2307326154_moon.mux

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomov: Log format rather than fourcc in stsd in trace mode
Vittorio Giovara [Tue, 30 Jun 2015 13:38:48 +0000 (15:38 +0200)]
mov: Log format rather than fourcc in stsd in trace mode

This will fix remaining format warnings.

4 years agomov: Adjust variable types to fix format warnings
Vittorio Giovara [Tue, 30 Jun 2015 13:38:47 +0000 (15:38 +0200)]
mov: Adjust variable types to fix format warnings

4 years agodump: Use the correct abs() version
Vittorio Giovara [Tue, 30 Jun 2015 13:38:46 +0000 (15:38 +0200)]
dump: Use the correct abs() version

Fix warning from clang "absolute value function 'abs' given an argument
of type 'long long' but has parameter of type 'int' which may cause
truncation of value [-Wabsolute-value]".

4 years agolavfi: Add library identifier
Vittorio Giovara [Tue, 30 Jun 2015 14:43:57 +0000 (16:43 +0200)]
lavfi: Add library identifier

4 years agolavd: Add library identifier
Vittorio Giovara [Tue, 30 Jun 2015 14:43:56 +0000 (16:43 +0200)]
lavd: Add library identifier

4 years agolavc: Add missing API guard to dtg_active_format option
Vittorio Giovara [Tue, 30 Jun 2015 16:28:26 +0000 (18:28 +0200)]
lavc: Add missing API guard to dtg_active_format option

4 years agog2meet: Add FATE tests for all three G2M variants
Diego Biurrun [Tue, 31 Mar 2015 14:31:34 +0000 (16:31 +0200)]
g2meet: Add FATE tests for all three G2M variants

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoGo2Meeting decoder
Kostya Shishkov [Fri, 10 Apr 2015 10:14:27 +0000 (12:14 +0200)]
Go2Meeting decoder

ELS and ePIC decoder courtesy of Maxim Poliakovski,
cleanup and integration by Diego Biurrun.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoffmpeg: windows: respond to logoff and ctrl+break messages as well
rogerdpack [Tue, 30 Jun 2015 22:31:19 +0000 (16:31 -0600)]
ffmpeg: windows: respond to logoff and ctrl+break messages as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: only count got_output/errors in decode_error_stat
Andreas Cadhalpun [Tue, 30 Jun 2015 19:09:50 +0000 (21:09 +0200)]
ffmpeg: only count got_output/errors in decode_error_stat

If threading is used, the first (thread_count - 1) packets are read
before any frame/error is returned. Counting this as successful decoding
is wrong, because it also happens when no single frame could be decoded.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoffmpeg: exit_on_error if decoding a packet failed
Andreas Cadhalpun [Tue, 30 Jun 2015 19:06:40 +0000 (21:06 +0200)]
ffmpeg: exit_on_error if decoding a packet failed

This is the second part of the fix for ticket #4370.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agopthread_frame: forward error codes when flushing
Andreas Cadhalpun [Tue, 30 Jun 2015 19:01:29 +0000 (21:01 +0200)]
pthread_frame: forward error codes when flushing

This is the first part of the fix for ticket #4370.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/h264: Greenmetadata SEI parsing
Nicolas DEROUINEAU [Tue, 30 Jun 2015 13:17:59 +0000 (15:17 +0200)]
avcodec/h264: Greenmetadata SEI parsing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'
Michael Niedermayer [Tue, 30 Jun 2015 20:51:19 +0000 (22:51 +0200)]
Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'

* commit '271ce76d317c5432e151216cf23f12b77ed6cb7e':
  h264: Parse registered data SEI message and AFD value

Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_sei.c
libavcodec/version.h

See: d6e95669496a89d186f923c34bcaf7d86b7cd59c
See: 22291c372fa703242e8429bed61700ba81258f19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091'
Michael Niedermayer [Tue, 30 Jun 2015 20:29:34 +0000 (22:29 +0200)]
Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091'

* commit '0bfab80a0d9fce0180e8aa2a947267f89b725091':
  h264_sei: Group error check outside the switch block

Conflicts:
libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0a49a62f998747cfa564d98d36a459fe70d3299b'
Michael Niedermayer [Tue, 30 Jun 2015 20:13:50 +0000 (22:13 +0200)]
Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b'

* commit '0a49a62f998747cfa564d98d36a459fe70d3299b':
  h263: Always check both dimensions

Conflicts:
libavcodec/ituh263dec.c

See: 62006b539ddda23594febf0fcb2f21c03de60457
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: Avoid unnecessary pixel format conversions
Martin Storsjö [Tue, 30 Jun 2015 19:35:44 +0000 (22:35 +0300)]
fate: Avoid unnecessary pixel format conversions

Most of the fate-dds-* and fate-txd-* tests already
output into the same pixel format regardless of
platform endianness, so there's no need to force
conversion to another format.

This fixes the tests fate-txd-16bpp, fate-txd-odd,
fate-dds-rgb16, fate-dds-rgb24 and fate-dds-xrgb on
big endian, where the tests seem to fail due to issues
with certain conversion codepaths in swscale.

Those conversion codepaths should of course be fixed, but
the individual decoder tests should use as little extra
conversion steps as possible.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f'
Michael Niedermayer [Tue, 30 Jun 2015 20:01:22 +0000 (22:01 +0200)]
Merge commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f'

* commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f':
  cosmetic: Reformat ff_h263_decode_mba

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a'
Michael Niedermayer [Tue, 30 Jun 2015 19:36:16 +0000 (21:36 +0200)]
Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a'

* commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a':
  mov: Preserve the metadata even when bit-exactness is requested

Conflicts:
libavformat/movenc.c
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth2-mpeg4

See: a17ee4117dcb2922f57da33b8401d11b06e81cba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'
Michael Niedermayer [Tue, 30 Jun 2015 19:19:16 +0000 (21:19 +0200)]
Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'

* commit '303ec065a90498c29d384b4add2ac626bc38d5eb':
  aic: Fix slice size computation for widths multiples of 32 macroblocks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a'
Michael Niedermayer [Tue, 30 Jun 2015 18:59:36 +0000 (20:59 +0200)]
Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a'

* commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a':
  h264: Allow stream and container cropping at the same time

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: Parse registered data SEI message and AFD value
Vittorio Giovara [Sun, 28 Jun 2015 10:13:05 +0000 (12:13 +0200)]
h264: Parse registered data SEI message and AFD value

Partially based on code by Marton Balint and Kieran Kunhya.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoh264_sei: Group error check outside the switch block
Vittorio Giovara [Sun, 28 Jun 2015 00:05:04 +0000 (02:05 +0200)]
h264_sei: Group error check outside the switch block

4 years agoh263: Always check both dimensions
Luca Barbato [Fri, 26 Jun 2015 13:57:16 +0000 (15:57 +0200)]
h263: Always check both dimensions

CC: libav-stable@libav.org
Found-By: ago@gentoo.org
4 years agocosmetic: Reformat ff_h263_decode_mba
Luca Barbato [Fri, 26 Jun 2015 13:57:15 +0000 (15:57 +0200)]
cosmetic: Reformat ff_h263_decode_mba

4 years agomov: Preserve the metadata even when bit-exactness is requested
Luca Barbato [Mon, 15 Jun 2015 18:40:46 +0000 (20:40 +0200)]
mov: Preserve the metadata even when bit-exactness is requested

Make sure to not write the custom `encoder` string in that case.

Bug-Id: 845
CC: libav-stable@libav.org
4 years agoaic: Fix slice size computation for widths multiples of 32 macroblocks
Vittorio Giovara [Sun, 28 Jun 2015 08:50:42 +0000 (10:50 +0200)]
aic: Fix slice size computation for widths multiples of 32 macroblocks

CC: libav-stable@libav.org
4 years agoh264: Allow stream and container cropping at the same time
Vittorio Giovara [Sun, 8 Mar 2015 04:06:32 +0000 (04:06 +0000)]
h264: Allow stream and container cropping at the same time

The container cropping is applied only when difference is within 16
pixels, and the smallest value between the two is chosen.

Bug-Id: 383
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agofate: Update ac3 test to the new request_channel_layout option
Vittorio Giovara [Sat, 27 Jun 2015 21:36:33 +0000 (23:36 +0200)]
fate: Update ac3 test to the new request_channel_layout option

4 years agompegts: Add jpeg2000 stream type
John Högberg [Mon, 29 Jun 2015 12:57:20 +0000 (14:57 +0200)]
mpegts: Add jpeg2000 stream type

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavfilter/vf_ssim: fix some cosmetics issues
Paul B Mahol [Tue, 30 Jun 2015 02:20:28 +0000 (02:20 +0000)]
avfilter/vf_ssim: fix some cosmetics issues

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f'
Michael Niedermayer [Tue, 30 Jun 2015 18:47:13 +0000 (20:47 +0200)]
Merge commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f'

* commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f':
  fate: Update ac3 test to the new request_channel_layout option

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h
Michael Niedermayer [Tue, 30 Jun 2015 17:37:12 +0000 (19:37 +0200)]
avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h

Fixes out of array access
Fixes: asan_heap-oob_4d5bb0_682_cov_3124593265_Fraunhofer__a_driving_force_in_innovation__small.mp4

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_transpose: Fix rounding error
Michael Niedermayer [Tue, 30 Jun 2015 14:01:15 +0000 (16:01 +0200)]
avfilter/vf_transpose: Fix rounding error

Fixes out of array access
Fixes: asan_heap-oob_7f875d_3482_cov_1818465256_ssudec.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Mention hap encoding for --enable-libsnappy.
Carl Eugen Hoyos [Tue, 30 Jun 2015 12:49:07 +0000 (14:49 +0200)]
configure: Mention hap encoding for --enable-libsnappy.