ffmpeg.git
3 years agoMerge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'
Michael Niedermayer [Fri, 17 Jul 2015 20:45:34 +0000 (22:45 +0200)]
Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'

* commit 'd42191c78befc1983f23b1899b2dda513b72f1ed':
  configure: Factor out vp8dsp module

Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b'
Michael Niedermayer [Fri, 17 Jul 2015 20:31:41 +0000 (22:31 +0200)]
Merge commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b'

* commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b':
  configure: Factor out vp56dsp module

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418'
Michael Niedermayer [Fri, 17 Jul 2015 20:21:36 +0000 (22:21 +0200)]
Merge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418'

* commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418':
  configure: Factor out rv34dsp module

Conflicts:
libavcodec/Makefile
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/libx264: fix MPEG2 support
Michael Niedermayer [Fri, 17 Jul 2015 20:10:58 +0000 (22:10 +0200)]
avcodec/libx264: fix MPEG2 support

Found-by: rcombs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'
Michael Niedermayer [Fri, 17 Jul 2015 19:59:45 +0000 (21:59 +0200)]
Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'

* commit '575ec60e542114b2ef5b2f88b28eeb72389dda45':
  configure: Factor out mss34dsp module

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '2edc77dc7be5f4a006c6295f4c827e5471f85262'
Michael Niedermayer [Fri, 17 Jul 2015 19:51:13 +0000 (21:51 +0200)]
Merge commit '2edc77dc7be5f4a006c6295f4c827e5471f85262'

* commit '2edc77dc7be5f4a006c6295f4c827e5471f85262':
  configure: Factor out ividsp module

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'
Michael Niedermayer [Fri, 17 Jul 2015 19:42:14 +0000 (21:42 +0200)]
Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'

* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0':
  configure: Factor out flacdsp module

Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '4da585ae478f8b6f865ab13779af399aee20d899'
Michael Niedermayer [Fri, 17 Jul 2015 19:32:12 +0000 (21:32 +0200)]
Merge commit '4da585ae478f8b6f865ab13779af399aee20d899'

* commit '4da585ae478f8b6f865ab13779af399aee20d899':
  OS/2: Cleanup slib_create_def_cmd

See: 22a0387df29c7450f57d09fbb24b7bc5f3b1fb89
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'
Michael Niedermayer [Fri, 17 Jul 2015 19:21:03 +0000 (21:21 +0200)]
Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'

* commit 'e1319aa1c1be9b64117c19170344fb78841dd67c':
  libx264: Add support for the MPEG2 encoder

Conflicts:
configure
libavcodec/Makefile
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/af_dynaudnorm: Fix "ISO C90 forbids mixed declarations and code" warnings
Michael Niedermayer [Fri, 17 Jul 2015 18:49:06 +0000 (20:49 +0200)]
avfilter/af_dynaudnorm: Fix "ISO C90 forbids mixed declarations and code" warnings

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/af_aresample: Check ff_all_* for allocation failures
Michael Niedermayer [Fri, 17 Jul 2015 18:27:25 +0000 (20:27 +0200)]
avfilter/af_aresample: Check ff_all_* for allocation failures

Fixes: signal_sigabrt_7ffff70eccc9_498_divx502.avi with memlimit 1572864

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoconfigure: Factor out vp8dsp module
Vittorio Giovara [Thu, 16 Jul 2015 15:11:02 +0000 (16:11 +0100)]
configure: Factor out vp8dsp module

3 years agoconfigure: Factor out vp56dsp module
Vittorio Giovara [Thu, 16 Jul 2015 15:11:01 +0000 (16:11 +0100)]
configure: Factor out vp56dsp module

3 years agoconfigure: Factor out rv34dsp module
Vittorio Giovara [Thu, 16 Jul 2015 15:11:00 +0000 (16:11 +0100)]
configure: Factor out rv34dsp module

3 years agoconfigure: Factor out mss34dsp module
Vittorio Giovara [Thu, 16 Jul 2015 15:10:59 +0000 (16:10 +0100)]
configure: Factor out mss34dsp module

3 years agoconfigure: Factor out ividsp module
Vittorio Giovara [Thu, 16 Jul 2015 15:10:58 +0000 (16:10 +0100)]
configure: Factor out ividsp module

3 years agoconfigure: Factor out flacdsp module
Vittorio Giovara [Thu, 16 Jul 2015 15:10:57 +0000 (16:10 +0100)]
configure: Factor out flacdsp module

3 years agoMerge commit '0cf5588d69922aa3e063bac6304c09c543a9ef52'
Michael Niedermayer [Fri, 17 Jul 2015 12:58:45 +0000 (14:58 +0200)]
Merge commit '0cf5588d69922aa3e063bac6304c09c543a9ef52'

* commit '0cf5588d69922aa3e063bac6304c09c543a9ef52':
  hq_hqa: Fix decoding when INFO section is absent

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'a53540840d26beb57a5e53b7f488c23ddf86e193'
Michael Niedermayer [Fri, 17 Jul 2015 12:48:41 +0000 (14:48 +0200)]
Merge commit 'a53540840d26beb57a5e53b7f488c23ddf86e193'

* commit 'a53540840d26beb57a5e53b7f488c23ddf86e193':
  APIchanges: Mention lavfi and lavd identification symbol addition

Conflicts:
doc/APIchanges

No change as these symbols have been added a very long time ago to FFmpeg
and are already listed in APIchanges

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'
Michael Niedermayer [Fri, 17 Jul 2015 12:40:19 +0000 (14:40 +0200)]
Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'

* commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1':
  Revert "mov: Double-check that alias path is not an absolute path"

Conflicts:
libavformat/mov.c

See: c9c7263e5820c957598643216c42be9b1c4f2d2b
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'
Michael Niedermayer [Fri, 17 Jul 2015 11:48:40 +0000 (13:48 +0200)]
Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'

* commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37':
  h264: Add support for Closed Caption export

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

See: 8234f0e3b485811d60c228c40a94a141c46e61ca
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter: bump minor and add Changelog entry
Paul B Mahol [Fri, 17 Jul 2015 11:39:52 +0000 (11:39 +0000)]
avfilter: bump minor and add Changelog entry

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/af_compand: fix clipping with default options
Paul B Mahol [Fri, 17 Jul 2015 11:23:45 +0000 (11:23 +0000)]
avfilter/af_compand: fix clipping with default options

Decays and attacks where by default set only for first channel
which caused poor defaults to be used which produced clipping
on any higher channel.

Reported-by: lachs0r
Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter: add Dynamic Audio Normalizer filter
LoRd_MuldeR [Tue, 7 Jul 2015 16:19:59 +0000 (16:19 +0000)]
avfilter: add Dynamic Audio Normalizer filter

3 years agoavfilter/af_astats: measure minimal and mean difference between two consecutive samples
Paul B Mahol [Fri, 17 Jul 2015 09:30:03 +0000 (09:30 +0000)]
avfilter/af_astats: measure minimal and mean difference between two consecutive samples

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoOS/2: Cleanup slib_create_def_cmd
Dave Yeo [Fri, 17 Jul 2015 05:21:11 +0000 (22:21 -0700)]
OS/2: Cleanup slib_create_def_cmd

Export symbols by name rather then ordinal.
Remove PROTMODE directive as it does not make sense for 32 bit library.
Also silences a warning from some linkers.

Signed-off-by: Dave Yeo <dave.r.yeo@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
3 years agolibx264: Add support for the MPEG2 encoder
Luca Barbato [Fri, 10 Jul 2015 12:45:14 +0000 (14:45 +0200)]
libx264: Add support for the MPEG2 encoder

3 years agohq_hqa: Fix decoding when INFO section is absent
Vittorio Giovara [Fri, 10 Jul 2015 14:52:00 +0000 (15:52 +0100)]
hq_hqa: Fix decoding when INFO section is absent

3 years agoAPIchanges: Mention lavfi and lavd identification symbol addition
Vittorio Giovara [Mon, 13 Jul 2015 23:11:16 +0000 (00:11 +0100)]
APIchanges: Mention lavfi and lavd identification symbol addition

3 years agoRevert "mov: Double-check that alias path is not an absolute path"
Vittorio Giovara [Fri, 10 Jul 2015 17:46:19 +0000 (18:46 +0100)]
Revert "mov: Double-check that alias path is not an absolute path"

This reverts commit 9286de045968ad456d4e752651eec22de5e89060.
The change broke support for legit absolute file paths.

Reported-by: Maksym Veremeyenko <verem@m1stereo.tv>.
3 years agoh264: Add support for Closed Caption export
Kieran Kunhya [Wed, 8 Jul 2015 22:17:44 +0000 (23:17 +0100)]
h264: Add support for Closed Caption export

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
3 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 16 Jul 2015 22:54:35 +0000 (00:54 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavfi/af_pan: Support a maximum of 64 channels.
  lswr: Allow 64 channels internally.
  lavc: Allow 64 channels internally.

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavfi/af_pan: Support a maximum of 64 channels.
Carl Eugen Hoyos [Thu, 16 Jul 2015 22:17:38 +0000 (00:17 +0200)]
lavfi/af_pan: Support a maximum of 64 channels.

The Soundflower input device supports 64 channels.

3 years agolswr: Allow 64 channels internally.
Carl Eugen Hoyos [Thu, 16 Jul 2015 22:17:08 +0000 (00:17 +0200)]
lswr: Allow 64 channels internally.

3 years agolavc: Allow 64 channels internally.
Carl Eugen Hoyos [Thu, 16 Jul 2015 22:16:45 +0000 (00:16 +0200)]
lavc: Allow 64 channels internally.

3 years agoavformat: bump micro version after adding concatdec features
Marton Balint [Sat, 11 Jul 2015 17:17:49 +0000 (19:17 +0200)]
avformat: bump micro version after adding concatdec features

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoconcatdec: add support for injecting packet metadata
Marton Balint [Thu, 2 Jul 2015 21:20:09 +0000 (23:20 +0200)]
concatdec: add support for injecting packet metadata

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoconcatdec: add support for specifying outpoint of files
Marton Balint [Thu, 2 Jul 2015 18:35:04 +0000 (20:35 +0200)]
concatdec: add support for specifying outpoint of files

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoconcatdec: store eof condition in context
Marton Balint [Sat, 4 Jul 2015 21:34:17 +0000 (23:34 +0200)]
concatdec: store eof condition in context

This is needed later for outpoint support which may leave the last file in a
not-eof state.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoconcatdec: add support for specifying inpoint of files
Marton Balint [Thu, 2 Jul 2015 17:56:25 +0000 (19:56 +0200)]
concatdec: add support for specifying inpoint of files

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agomxfdec: calculate the index in display order
Marton Balint [Sat, 11 Jul 2015 16:10:12 +0000 (18:10 +0200)]
mxfdec: calculate the index in display order

This should fix seeking for open GOP files as well.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoRefactoring to move common QSV-related code part into libavcodec/qsvdec.c
Ivan Uskov [Tue, 14 Jul 2015 11:07:04 +0000 (07:07 -0400)]
Refactoring to move common QSV-related code part into libavcodec/qsvdec.c

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/snappy: refactor so ff_snappy_uncompress uses an existing buffer
Tom Butterworth [Thu, 16 Jul 2015 12:23:22 +0000 (13:23 +0100)]
avcodec/snappy: refactor so ff_snappy_uncompress uses an existing buffer

Some uses of Snappy require uncompressing to positions within an existing buffer. Also adds a function to get the uncompressed length of Snappy data.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_eq: Support contrast from -1000 to 1000
Michael Niedermayer [Wed, 15 Jul 2015 13:38:59 +0000 (15:38 +0200)]
avfilter/vf_eq: Support contrast from -1000 to 1000

Fixes "-vf eq=0.05,eq=20"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/af_astats: make sure p->last is actually always set when measuring max diffe...
Paul B Mahol [Wed, 15 Jul 2015 19:24:37 +0000 (19:24 +0000)]
avfilter/af_astats: make sure p->last is actually always set when measuring max difference

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/af_astats: also measure maximal difference between two consecutive samples
Paul B Mahol [Wed, 15 Jul 2015 19:00:25 +0000 (19:00 +0000)]
avfilter/af_astats: also measure maximal difference between two consecutive samples

While here also mention bit depth in documentation.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/hap: move some per-stream setup into decoder init rather than per-frame
Tom Butterworth [Thu, 16 Jul 2015 12:23:21 +0000 (13:23 +0100)]
avcodec/hap: move some per-stream setup into decoder init rather than per-frame

This change will reject frames with a texture type which doesn't match the stream description.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 MC functions
Shivraj Patil [Thu, 9 Jul 2015 13:15:26 +0000 (18:45 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 MC functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for VP9 MC functions in new file vp9_mc_msa.c

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoswscale/ppc/yuv2rgb_altivec: POWER LE support in the macros vec_unh() and vec_unl()
Rong Yan [Thu, 16 Jul 2015 08:52:47 +0000 (03:52 -0500)]
swscale/ppc/yuv2rgb_altivec: POWER LE support in the macros vec_unh() and vec_unl()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: loongson optimized idctdsp with mmi
周晓勇 [Thu, 16 Jul 2015 07:07:14 +0000 (15:07 +0800)]
avcodec: loongson optimized idctdsp with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: loongson add constant definition
周晓勇 [Thu, 16 Jul 2015 07:06:27 +0000 (15:06 +0800)]
avcodec: loongson add constant definition

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/pthread_frame: clear priv_data, avoid stale pointer in error case
Michael Niedermayer [Thu, 16 Jul 2015 09:52:33 +0000 (11:52 +0200)]
avcodec/pthread_frame: clear priv_data, avoid stale pointer in error case

Fixes: b4b47bc2b3fb7ca710bfffe5aa969e37_signal_sigabrt_7ffff70eccc9_744_nc_sample2.avi with memlimit of 4194304

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc: Add properties field to AVCodecContext.
Carl Eugen Hoyos [Thu, 16 Jul 2015 07:47:55 +0000 (09:47 +0200)]
lavc: Add properties field to AVCodecContext.

The new field can hold information about losslessness and closed captions for now.

3 years agocheckasm: Add unit tests for h264qpel
Henrik Gramner [Mon, 13 Jul 2015 21:11:25 +0000 (23:11 +0200)]
checkasm: Add unit tests for h264qpel

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
3 years agompegts: Mark the muxer as supporting variable fps
Luca Barbato [Tue, 30 Jun 2015 14:24:12 +0000 (16:24 +0200)]
mpegts: Mark the muxer as supporting variable fps

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
3 years agohevc: Split the struct setup from the pps parsing
Luca Barbato [Tue, 14 Jul 2015 10:31:15 +0000 (12:31 +0200)]
hevc: Split the struct setup from the pps parsing

3 years agoavfilter/vf_smartblur: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 15 Jul 2015 03:54:00 +0000 (03:54 +0000)]
avfilter/vf_smartblur: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/af_astats: calculate audio bit-depth
Paul B Mahol [Mon, 13 Jul 2015 08:49:26 +0000 (08:49 +0000)]
avfilter/af_astats: calculate audio bit-depth

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter: add erosion, dilation, deflate & inflate filter
Paul B Mahol [Wed, 25 Feb 2015 09:34:32 +0000 (09:34 +0000)]
avfilter: add erosion, dilation, deflate & inflate filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agotests/checkasm/checkasm: Give macro a body to avoid potential unexpected syntax issues
Michael Niedermayer [Thu, 16 Jul 2015 02:02:51 +0000 (04:02 +0200)]
tests/checkasm/checkasm: Give macro a body to avoid potential unexpected syntax issues

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/utils: Fix regression with H264 stream probing
Michael Niedermayer [Thu, 16 Jul 2015 01:37:43 +0000 (03:37 +0200)]
avformat/utils: Fix regression with H264 stream probing

Fixes Ticket4725

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/utils: Print stream number in max_analyze_duration exit path
Michael Niedermayer [Thu, 16 Jul 2015 01:30:24 +0000 (03:30 +0200)]
avformat/utils: Print stream number in max_analyze_duration exit path

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf/rtpenc_jpeg: Fix sending multiple quantization tables.
Carl Eugen Hoyos [Wed, 15 Jul 2015 22:36:13 +0000 (00:36 +0200)]
lavf/rtpenc_jpeg: Fix sending multiple quantization tables.

3 years agoapng: Fix wrong default final frame delay in muxer
Donny Yang [Mon, 13 Jul 2015 08:17:42 +0000 (08:17 +0000)]
apng: Fix wrong default final frame delay in muxer

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '2cb34f82b92c15b811f5c03dc7f61a4baf6e02e3'
Michael Niedermayer [Wed, 15 Jul 2015 20:43:43 +0000 (22:43 +0200)]
Merge commit '2cb34f82b92c15b811f5c03dc7f61a4baf6e02e3'

* commit '2cb34f82b92c15b811f5c03dc7f61a4baf6e02e3':
  checkasm: Add unit tests for h264qpel

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e'
Michael Niedermayer [Wed, 15 Jul 2015 19:29:07 +0000 (21:29 +0200)]
Merge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e'

* commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e':
  mpegts: Mark the muxer as supporting variable fps

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'c88c5eef53ff1619724ba47b722da64ec0593dab'
Michael Niedermayer [Wed, 15 Jul 2015 19:21:40 +0000 (21:21 +0200)]
Merge commit 'c88c5eef53ff1619724ba47b722da64ec0593dab'

* commit 'c88c5eef53ff1619724ba47b722da64ec0593dab':
  hevc: Split the struct setup from the pps parsing

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/mpeg4videodec: Clarify the mpeg4_unpack_bframes reference.
Michael Niedermayer [Wed, 15 Jul 2015 19:05:24 +0000 (21:05 +0200)]
avcodec/mpeg4videodec: Clarify the mpeg4_unpack_bframes reference.

This should avoid misunderstandings like in Ticket4618

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoswscale/utils: Clear pix buffers
Michael Niedermayer [Wed, 15 Jul 2015 17:20:19 +0000 (19:20 +0200)]
swscale/utils: Clear pix buffers

Fixes use of uninitialized memory
Fixes: a96874b9466b6edc660a519c7ad47977_signal_sigsegv_7ffff713351a_744_nc_sample.avi with memlimit 2147483648

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/mips/mpegvideo_mmi: Use av_assert2()
Michael Niedermayer [Wed, 15 Jul 2015 14:37:58 +0000 (16:37 +0200)]
avcodec/mips/mpegvideo_mmi: Use av_assert2()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: loongson optimized mpegvideo dct unquantize with mmi
ZhouXiaoyong [Thu, 9 Jul 2015 06:34:21 +0000 (14:34 +0800)]
avcodec: loongson optimized mpegvideo dct unquantize with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: loongson optimized h264pred with mmi
周晓勇 [Thu, 9 Jul 2015 09:10:42 +0000 (17:10 +0800)]
avcodec: loongson optimized h264pred with mmi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoconfigure: loongson disable expensive optimizations in gcc O3 optimization
周晓勇 [Wed, 15 Jul 2015 09:28:31 +0000 (17:28 +0800)]
configure: loongson disable expensive optimizations in gcc O3 optimization

With gcc-4.9.2 loongson faild in test fate-dca, this is caused by option
-fexpensive-optimizations in -O3 optimization. We disable it temporarily
before the bug been fixed up.

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/internal: add more words to sentance
Michael Niedermayer [Wed, 15 Jul 2015 11:09:41 +0000 (13:09 +0200)]
avfilter/internal: add more words to sentance

Hopefully fixes english syntax

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMAINTAINERS: add myself as libkvazaar maintainer
Arttu Ylä-Outinen [Wed, 15 Jul 2015 06:01:23 +0000 (09:01 +0300)]
MAINTAINERS: add myself as libkvazaar maintainer

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/mov: Implement a same origin policy for references instead of only allowing...
Michael Niedermayer [Wed, 15 Jul 2015 10:18:52 +0000 (12:18 +0200)]
avformat/mov: Implement a same origin policy for references instead of only allowing a subset of relative pathes in references

Fixes Ticket4671

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/x86/vf_psnr.asm: split one line of license text into two
Paul B Mahol [Tue, 14 Jul 2015 23:54:26 +0000 (23:54 +0000)]
avfilter/x86/vf_psnr.asm: split one line of license text into two

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/vf_removegrain: add x86 and x86_64 SSE2 functions
James Darnley [Tue, 14 Jul 2015 23:48:47 +0000 (23:48 +0000)]
avfilter/vf_removegrain: add x86 and x86_64 SSE2 functions

Speed of all modes increased by a factor between 7.4 and 19.8 largely depending
on whether bytes are unpacked into words.  Modes 2, 3, and 4 have been sped-up
by a factor of 43 (thanks quick sort!)

All modes are available on x86_64 but only modes 1, 10, 11, 12, 13, 14, 19, 20,
21, and 22 are available on x86 due to the number of SIMD registers used.

With a contribution from James Almer <jamrial@gmail.com>

3 years agoavcodec/mjpegdec: Fix DC overflow in decode_block()
Michael Niedermayer [Wed, 15 Jul 2015 02:59:35 +0000 (04:59 +0200)]
avcodec/mjpegdec: Fix DC overflow in decode_block()

Fixes Ticket4683

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/utils: inform the user if the protocol cannot be determined
Michael Niedermayer [Wed, 15 Jul 2015 01:44:00 +0000 (03:44 +0200)]
avformat/utils: inform the user if the protocol cannot be determined

Assuming the wrong protocol can lead to suboptimal seeking performance

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/utils: adjust short skip threshold in ff_configure_buffers_for_index() to...
Michael Niedermayer [Wed, 15 Jul 2015 01:35:08 +0000 (03:35 +0200)]
avformat/utils: adjust short skip threshold in ff_configure_buffers_for_index() to avoid seeking if a packet is skiped

Fixes Ticket4126

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/mov: Fix opening relative references
Michael Niedermayer [Tue, 14 Jul 2015 23:01:30 +0000 (01:01 +0200)]
avformat/mov: Fix opening relative references

Possibly fixes Ticket4671

the removed check is wrong and insufficient

Based on patch by Maksym Veremeyenko <verem@m1.tv>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/mpeg12dec: Fix decoding of faulty interlaced mpeg2
Michael Niedermayer [Tue, 14 Jul 2015 21:58:08 +0000 (23:58 +0200)]
avcodec/mpeg12dec: Fix decoding of faulty interlaced mpeg2

Fixes Ticket4721

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/internal: Improve docs about ff_request_frame()
Michael Niedermayer [Tue, 14 Jul 2015 17:44:59 +0000 (19:44 +0200)]
avfilter/internal: Improve docs about ff_request_frame()

Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/nvenc: Fix build with older gcc versions
Timo Rothenpieler [Tue, 14 Jul 2015 20:58:54 +0000 (22:58 +0200)]
avcodec/nvenc: Fix build with older gcc versions

Aparently anonymous structs weren't always supported, not even sure if
they are standard conformant.

3 years agoavformat: don't crash API users when demuxing mp4
wm4 [Tue, 14 Jul 2015 19:08:24 +0000 (21:08 +0200)]
avformat: don't crash API users when demuxing mp4

This code is one big chunk of WTF.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: add libkvazaar HECV encoder
Arttu Ylä-Outinen [Tue, 14 Jul 2015 05:53:35 +0000 (08:53 +0300)]
avcodec: add libkvazaar HECV encoder

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agovf_psnr: sse2 optimizations for sum-squared-error.
Ronald S. Bultje [Sun, 12 Jul 2015 10:44:39 +0000 (06:44 -0400)]
vf_psnr: sse2 optimizations for sum-squared-error.

The internal line accumulator for 16bit can overflow, so I changed that
from int to uint64_t in the C code. The matching assembly looks a little
weird but output looks correct.

(avx2 should be trivial to add later.)

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavutil/fifo: Fix the case where func() returns less bytes than requested in av_fifo_g...
Zhang Rui [Tue, 14 Jul 2015 06:47:26 +0000 (14:47 +0800)]
avutil/fifo: Fix the case where func() returns less bytes than requested in av_fifo_generic_write()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffmpeg: Fix cleanup after failed allocation of output_files
Michael Niedermayer [Tue, 14 Jul 2015 13:49:41 +0000 (15:49 +0200)]
ffmpeg: Fix cleanup after failed allocation of output_files

Fixes: 39a25908b84604acdaa490138282d091_signal_sigsegv_7ffff713351a_331_WAWV.avi with memlimit of 262144

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/mov: Fix deallocation when MOVStreamContext failed to allocate
Michael Niedermayer [Tue, 14 Jul 2015 12:14:16 +0000 (14:14 +0200)]
avformat/mov: Fix deallocation when MOVStreamContext failed to allocate

Fixes: 260813283176b57b3c9974fe284eebc3_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 262144

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_ssim: Fix "incompatible pointer type" warnings
Michael Niedermayer [Tue, 14 Jul 2015 11:29:55 +0000 (13:29 +0200)]
avfilter/vf_ssim: Fix "incompatible pointer type" warnings

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffmpeg: Fix crash with ost->last_frame allocation failure
Michael Niedermayer [Tue, 14 Jul 2015 11:02:19 +0000 (13:02 +0200)]
ffmpeg: Fix crash with ost->last_frame allocation failure

Fixes: 1013dbde2c360d939cc2dfc33e4f275c_signal_sigsegv_a0500f_45_320vp3.nsv with memlimit of 536870912

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffmpeg: Fix deallocating input threads with partly failed file allocation
Michael Niedermayer [Tue, 14 Jul 2015 10:40:04 +0000 (12:40 +0200)]
ffmpeg: Fix deallocating input threads with partly failed file allocation

Fixes: 18615ff56beedc63a884a8db0678b47c_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 524288

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agovf_ssim: x86 simd for ssim_4x4xN and ssim_endN.
Ronald S. Bultje [Sun, 12 Jul 2015 23:33:06 +0000 (19:33 -0400)]
vf_ssim: x86 simd for ssim_4x4xN and ssim_endN.

Both are 2-2.5x faster than their C counterpart.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavutil/mem_internal: add missing header includes
James Almer [Mon, 13 Jul 2015 21:05:48 +0000 (18:05 -0300)]
avutil/mem_internal: add missing header includes

Fixes make checkheaders

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolibavcodec/qsv.c: Issue fixed: QSV engine does not release display handler under...
Ivan Uskov [Mon, 13 Jul 2015 14:17:54 +0000 (10:17 -0400)]
libavcodec/qsv.c: Issue fixed: QSV engine does not release display handler under linux platform.

Reviewed-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'a5a6a786bfebb85c269abc25559fd71963983581'
Michael Niedermayer [Mon, 13 Jul 2015 23:46:16 +0000 (01:46 +0200)]
Merge commit 'a5a6a786bfebb85c269abc25559fd71963983581'

* commit 'a5a6a786bfebb85c269abc25559fd71963983581':
  mp3: Forward seeking errors

Conflicts:
libavformat/mp3dec.c

No change as the avio_seek() that are part of seeking in mp3 are already
checked in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '32c8d89c036b0e75ece74aea638df587099def0b'
Michael Niedermayer [Mon, 13 Jul 2015 23:33:58 +0000 (01:33 +0200)]
Merge commit '32c8d89c036b0e75ece74aea638df587099def0b'

* commit '32c8d89c036b0e75ece74aea638df587099def0b':
  hevc: Print the non-supported chroma_format_idc

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '8e373fe048812a25b238ea60a7052b8c07639a42'
Michael Niedermayer [Mon, 13 Jul 2015 23:23:39 +0000 (01:23 +0200)]
Merge commit '8e373fe048812a25b238ea60a7052b8c07639a42'

* commit '8e373fe048812a25b238ea60a7052b8c07639a42':
  hevc: Factor out the pixel format mapping from the sps parser

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>