ffmpeg.git
4 years agox86/vp9: add avx2 subpel MC SIMD for 10/12bpp
James Almer [Fri, 18 Sep 2015 01:49:58 +0000 (22:49 -0300)]
x86/vp9: add avx2 subpel MC SIMD for 10/12bpp

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavfilter/vf_colorkey: Improve filter description
Timo Rothenpieler [Fri, 18 Sep 2015 12:47:59 +0000 (14:47 +0200)]
avfilter/vf_colorkey: Improve filter description

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
4 years agoChangelog: add forgotten entry
Paul B Mahol [Thu, 17 Sep 2015 21:16:51 +0000 (21:16 +0000)]
Changelog: add forgotten entry

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/dcaenc: fix lfe fir coefficients
Paul B Mahol [Thu, 17 Sep 2015 21:13:37 +0000 (21:13 +0000)]
avcodec/dcaenc: fix lfe fir coefficients

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/mpeg12enc: Basic support for encoding non even QPs for -non_linear_quant 1
Michael Niedermayer [Thu, 17 Sep 2015 22:37:28 +0000 (00:37 +0200)]
avcodec/mpeg12enc: Basic support for encoding non even QPs for -non_linear_quant 1

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mpeg12dec: Move non_linear_qscale to mpegvideodata
Michael Niedermayer [Thu, 17 Sep 2015 22:35:28 +0000 (00:35 +0200)]
avcodec/mpeg12dec: Move non_linear_qscale to mpegvideodata

This will be used in the next commit

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mpegvideo: Change mpeg2 unquant to work with higher precission qscale
Michael Niedermayer [Thu, 17 Sep 2015 21:47:06 +0000 (23:47 +0200)]
avcodec/mpegvideo: Change mpeg2 unquant to work with higher precission qscale

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mpegvideo_enc: Add missing entry to non_linear_qscale table
Michael Niedermayer [Thu, 17 Sep 2015 19:37:27 +0000 (21:37 +0200)]
avcodec/mpegvideo_enc: Add missing entry to non_linear_qscale table

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/dcaenc: unbreak >4 channel support
Paul B Mahol [Thu, 17 Sep 2015 19:13:52 +0000 (19:13 +0000)]
avcodec/dcaenc: unbreak >4 channel support

LFE channel is still broken, search for FIXME.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agocheckasm: add flacdsp decorrelate tests
James Almer [Thu, 17 Sep 2015 18:22:25 +0000 (15:22 -0300)]
checkasm: add flacdsp decorrelate tests

Reviewed-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavutil/log: fix zero length gnu_printf format string warning
Ganesh Ajjanagadde [Thu, 17 Sep 2015 12:11:39 +0000 (08:11 -0400)]
avutil/log: fix zero length gnu_printf format string warning

This should fix warning reported by fate client:
http://fate.ffmpeg.org/report.cgi?time=20150917113121&slot=x86_32-linux-gnu-gcc-4.5.1-have_6regs.
Untested.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavf/utils: remove some left-over cruft from the 32-bit size fields
Hendrik Leppkes [Thu, 17 Sep 2015 14:54:00 +0000 (16:54 +0200)]
lavf/utils: remove some left-over cruft from the 32-bit size fields

4 years agolavc/lavf: remove incompatible abi checks for the new 64bit fields
James Almer [Wed, 16 Sep 2015 04:46:50 +0000 (01:46 -0300)]
lavc/lavf: remove incompatible abi checks for the new 64bit fields

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agodoc/filters: showfreqs: fix typo
Paul B Mahol [Thu, 17 Sep 2015 14:12:33 +0000 (14:12 +0000)]
doc/filters: showfreqs: fix typo

Fixes #4863

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/mips/aaccoder_mips: Remove duplicate include
Michael Niedermayer [Thu, 17 Sep 2015 11:39:14 +0000 (13:39 +0200)]
avcodec/mips/aaccoder_mips: Remove duplicate include

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodoc/filters: stereotools: fix mistake
Paul B Mahol [Thu, 17 Sep 2015 13:11:30 +0000 (13:11 +0000)]
doc/filters: stereotools: fix mistake

Reported-by: RiCON
Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/af_sidechaincompress: do not use floats
Paul B Mahol [Thu, 17 Sep 2015 13:05:15 +0000 (13:05 +0000)]
avfilter/af_sidechaincompress: do not use floats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_atadenoise: fix file permissions
Paul B Mahol [Thu, 17 Sep 2015 12:41:42 +0000 (12:41 +0000)]
avfilter/vf_atadenoise: fix file permissions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e'
Hendrik Leppkes [Thu, 17 Sep 2015 09:46:34 +0000 (11:46 +0200)]
Merge commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e'

* commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e':
  avconv_opt: Allow printing private options

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86'
Hendrik Leppkes [Thu, 17 Sep 2015 09:31:40 +0000 (11:31 +0200)]
Merge commit 'e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86'

* commit 'e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86':
  d3d11va: WindowsPhone requires a mutex around ID3D11VideoContext

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoavfilter/af_sidechaincompress: use doubles instead of floats
Paul B Mahol [Wed, 16 Sep 2015 12:05:16 +0000 (12:05 +0000)]
avfilter/af_sidechaincompress: use doubles instead of floats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter: add stereo tools filter
Paul B Mahol [Tue, 15 Sep 2015 14:23:04 +0000 (14:23 +0000)]
avfilter: add stereo tools filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit '781a25e9c419dd66063597cc5d70e8919de60561'
Hendrik Leppkes [Thu, 17 Sep 2015 09:28:19 +0000 (11:28 +0200)]
Merge commit '781a25e9c419dd66063597cc5d70e8919de60561'

* commit '781a25e9c419dd66063597cc5d70e8919de60561':
  checkasm: v210: Fix array overwrite

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '4a664224502b42e3b28949d905a8de7769892184'
Hendrik Leppkes [Thu, 17 Sep 2015 09:27:23 +0000 (11:27 +0200)]
Merge commit '4a664224502b42e3b28949d905a8de7769892184'

* commit '4a664224502b42e3b28949d905a8de7769892184':
  pixfmt: Add new SMPTE color primaries and transfer characteristic values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '777885983533235ccda5145f96317fc8cd0a18ab'
Hendrik Leppkes [Thu, 17 Sep 2015 09:21:07 +0000 (11:21 +0200)]
Merge commit '777885983533235ccda5145f96317fc8cd0a18ab'

* commit '777885983533235ccda5145f96317fc8cd0a18ab':
  dcadec: set channel layout in a separate function

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '971177f751a6e2931232accceab438bce277bde8'
Hendrik Leppkes [Thu, 17 Sep 2015 09:08:22 +0000 (11:08 +0200)]
Merge commit '971177f751a6e2931232accceab438bce277bde8'

* commit '971177f751a6e2931232accceab438bce277bde8':
  dcadec: scan for extensions in a separate function

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '22cc57da64bfd73f2206969486b0aa183ee76479'
Hendrik Leppkes [Thu, 17 Sep 2015 09:01:16 +0000 (11:01 +0200)]
Merge commit '22cc57da64bfd73f2206969486b0aa183ee76479'

* commit '22cc57da64bfd73f2206969486b0aa183ee76479':
  rtpdec: Forward the memory failure

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoavconv_opt: Allow printing private options
Vittorio Giovara [Mon, 14 Sep 2015 11:39:55 +0000 (13:39 +0200)]
avconv_opt: Allow printing private options

Add an allowed parameter to -h and --help avconv option to print private
options from a codec, format, or filter, named with the provided input
value.

In case multiple classes are found (eg. mov demuxer and mov muxer, or
h264 decoder and h264 demuxer) print all options from all classes.
It is possible to select the type of class to print by adding it
before the name (eg. demuxer:mov and muxer:mov, or decoder:h264and
demuxer:h264).

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agod3d11va: WindowsPhone requires a mutex around ID3D11VideoContext
Steve Lhomme [Wed, 16 Sep 2015 11:27:42 +0000 (13:27 +0200)]
d3d11va: WindowsPhone requires a mutex around ID3D11VideoContext

4 years agocheckasm: v210: Fix array overwrite
Henrik Gramner [Wed, 16 Sep 2015 12:03:01 +0000 (14:03 +0200)]
checkasm: v210: Fix array overwrite

4 years agopixfmt: Add new SMPTE color primaries and transfer characteristic values
Kevin Wheatley [Fri, 28 Aug 2015 14:20:22 +0000 (15:20 +0100)]
pixfmt: Add new SMPTE color primaries and transfer characteristic values

Appeared in ITU-T Rec H.265 10/2014.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoRevert "avformat/format: silence -Wdiscarded-qualifiers"
Timothy Gu [Thu, 17 Sep 2015 02:53:13 +0000 (19:53 -0700)]
Revert "avformat/format: silence -Wdiscarded-qualifiers"

This reverts commit 27cbe4588aeaa3272f16e395bc2a337e1e43e2b6.

See
https://lists.ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179002.html

Requested-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
4 years agoAAC encoder: refactor to resynchronize MIPS port
Claudio Freire [Tue, 15 Sep 2015 06:59:45 +0000 (03:59 -0300)]
AAC encoder: refactor to resynchronize MIPS port

This patch refactors the AAC coders to reuse code
between the MIPS port and the regular, portable C code.
There were two main functions that had to use
hand-optimized versions of quantization code:
 - search_for_quantizers_twoloop
 - codebook_trellis_rate

Those two were split into their own template header
files so they can be inlined inside both the MIPS port
and the generic code. In each context, they'll link
to their specialized implementations, and thus be
optimized by the compiler.

This approach I believe is better than maintaining
several copies of each function. As past experience has
proven, having to keep those in sync was error prone.
In this way, they will remain in sync by default.

Also, an implementation of the dequantized output
argument for the optimized quantize_and_encode
functions is included in the patch. While the current
implementation of search_for_pred still isn't using
it, future iterations of main prediction probably will.
It should not imply any measurable performance hit while
not being used.

4 years agovp9: add subpel MC SIMD for 10/12bpp.
Ronald S. Bultje [Wed, 16 Sep 2015 20:07:46 +0000 (16:07 -0400)]
vp9: add subpel MC SIMD for 10/12bpp.

4 years agovp9: add fullpel (avg) MC SIMD for 10/12bpp.
Ronald S. Bultje [Wed, 16 Sep 2015 13:12:27 +0000 (09:12 -0400)]
vp9: add fullpel (avg) MC SIMD for 10/12bpp.

4 years agovp9: add fullpel (put) MC SIMD for 10/12bpp.
Ronald S. Bultje [Wed, 16 Sep 2015 13:08:04 +0000 (09:08 -0400)]
vp9: add fullpel (put) MC SIMD for 10/12bpp.

4 years agoavformat/avidec: disable parsing for RV40
Michael Niedermayer [Wed, 16 Sep 2015 21:54:48 +0000 (23:54 +0200)]
avformat/avidec: disable parsing for RV40

Fixes: broken_rv40.avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/rv34: Delay failure return for B frames with a missing reference
Michael Niedermayer [Wed, 16 Sep 2015 21:52:51 +0000 (23:52 +0200)]
avcodec/rv34: Delay failure return for B frames with a missing reference

Failing earlier causes the context to be insufficiently initialized which
can break decoding future frames with threads

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale/swscale: silence unused function warning
Ganesh Ajjanagadde [Wed, 16 Sep 2015 21:20:22 +0000 (17:20 -0400)]
swscale/swscale: silence unused function warning

gamma_convert is only used with the old code. Thus, it is
placed under a header guard. This patch silences a -Wunused-function
observed on GCC 5.2.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavformat/mpjpegdec: silence unused variable/function warnings
Ganesh Ajjanagadde [Wed, 16 Sep 2015 21:25:53 +0000 (17:25 -0400)]
avformat/mpjpegdec: silence unused variable/function warnings

Silences a -Wunused-variable and -Wunused-function observed under GCC 5.2.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavformat/format: silence -Wdiscarded-qualifiers
Ganesh Ajjanagadde [Wed, 16 Sep 2015 22:50:54 +0000 (18:50 -0400)]
avformat/format: silence -Wdiscarded-qualifiers

lpd.buf is non-const and discards the const qualifier of zerobuffer.
This fixes -Wdiscarded-qualifiers observed with GCC 5.2.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoconfigure: Print large lists in more columns if the screen size allows
Timothy Gu [Mon, 14 Sep 2015 23:34:50 +0000 (16:34 -0700)]
configure: Print large lists in more columns if the screen size allows

Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodcadec: set channel layout in a separate function
Alexandra Hájková [Tue, 15 Sep 2015 12:13:26 +0000 (14:13 +0200)]
dcadec: set channel layout in a separate function

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agodcadec: scan for extensions in a separate function
Alexandra Hájková [Tue, 15 Sep 2015 11:11:32 +0000 (13:11 +0200)]
dcadec: scan for extensions in a separate function

to make dca_decode_frame more readable

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agortpdec: Forward the memory failure
Luca Barbato [Wed, 16 Sep 2015 10:07:00 +0000 (12:07 +0200)]
rtpdec: Forward the memory failure

And avoid a memory leak.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoaacenc_tns: fix coefficient compression condition
Rostislav Pehlivanov [Wed, 16 Sep 2015 16:48:02 +0000 (17:48 +0100)]
aacenc_tns: fix coefficient compression condition

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agotests/checkasm/vp9dsp: Use snprintf() for safetey
Michael Niedermayer [Wed, 16 Sep 2015 12:08:42 +0000 (14:08 +0200)]
tests/checkasm/vp9dsp: Use snprintf() for safetey

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56'
Hendrik Leppkes [Wed, 16 Sep 2015 12:11:24 +0000 (14:11 +0200)]
Merge commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56'

* commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56':
  rtsp: warning when max_delay reached

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'd555bd69e792e42d94bd909b30d9bfef01db4e25'
Hendrik Leppkes [Wed, 16 Sep 2015 12:11:06 +0000 (14:11 +0200)]
Merge commit 'd555bd69e792e42d94bd909b30d9bfef01db4e25'

* commit 'd555bd69e792e42d94bd909b30d9bfef01db4e25':
  rtpdec: inform jitter buffer size

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'ff7f6ea9db2a77d74f7e68a716f53ba1f3f85017'
Hendrik Leppkes [Wed, 16 Sep 2015 12:10:27 +0000 (14:10 +0200)]
Merge commit 'ff7f6ea9db2a77d74f7e68a716f53ba1f3f85017'

* commit 'ff7f6ea9db2a77d74f7e68a716f53ba1f3f85017':
  rtpdec: add a trace when jitter buffer is full

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '3c525b8b4770c1ac5f466a12c5523802bd5d40eb'
Hendrik Leppkes [Wed, 16 Sep 2015 12:07:05 +0000 (14:07 +0200)]
Merge commit '3c525b8b4770c1ac5f466a12c5523802bd5d40eb'

* commit '3c525b8b4770c1ac5f466a12c5523802bd5d40eb':
  rtpdec: Increase the max size of the jitter buffer to 500 packets

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '570fcaf3326aef9313b10863e2f6e6ae664d9dae'
Hendrik Leppkes [Wed, 16 Sep 2015 12:04:46 +0000 (14:04 +0200)]
Merge commit '570fcaf3326aef9313b10863e2f6e6ae664d9dae'

* commit '570fcaf3326aef9313b10863e2f6e6ae664d9dae':
  jpeg2000: Factor out prec init

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agolavf/riff: Support decoding Ambisonic wav files.
Carl Eugen Hoyos [Wed, 16 Sep 2015 12:03:13 +0000 (14:03 +0200)]
lavf/riff: Support decoding Ambisonic wav files.

Reported and tested by Andy Furniss, adf d lists at gmail

4 years agoMerge commit '95a41311ac3a44773cc4dc407408aca35b1f8e26'
Hendrik Leppkes [Wed, 16 Sep 2015 12:01:58 +0000 (14:01 +0200)]
Merge commit '95a41311ac3a44773cc4dc407408aca35b1f8e26'

* commit '95a41311ac3a44773cc4dc407408aca35b1f8e26':
  jpeg2000: Factor out band stepsize initialization

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '7fb93eae43cc89bd7c1c275344e1cdbadab7155b'
Hendrik Leppkes [Wed, 16 Sep 2015 11:58:30 +0000 (13:58 +0200)]
Merge commit '7fb93eae43cc89bd7c1c275344e1cdbadab7155b'

* commit '7fb93eae43cc89bd7c1c275344e1cdbadab7155b':
  jpeg2000: Factor out band initialization

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '1b709f23fb5f505c834d4c855703225795def01d'
Hendrik Leppkes [Wed, 16 Sep 2015 11:57:50 +0000 (13:57 +0200)]
Merge commit '1b709f23fb5f505c834d4c855703225795def01d'

* commit '1b709f23fb5f505c834d4c855703225795def01d':
  jpeg2000: Refactor decode_packets

Not merged, as the ffmpeg code is much more advanced.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agocheckasm: v210: Fix array overwrite
Henrik Gramner [Tue, 15 Sep 2015 21:21:28 +0000 (23:21 +0200)]
checkasm: v210: Fix array overwrite

4 years agocheckasm: v210: s/Libav/FFmpeg/
Henrik Gramner [Wed, 16 Sep 2015 11:48:43 +0000 (13:48 +0200)]
checkasm: v210: s/Libav/FFmpeg/

4 years agoMerge commit '29b00f880faa404aa1d0d6820310c510c5996479'
Hendrik Leppkes [Wed, 16 Sep 2015 10:00:53 +0000 (12:00 +0200)]
Merge commit '29b00f880faa404aa1d0d6820310c510c5996479'

* commit '29b00f880faa404aa1d0d6820310c510c5996479':
  jpeg2000: Templatize the frame writer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoavfilter/af_ladspa: process all channels for nb_handles > 1
Paul B Mahol [Wed, 16 Sep 2015 09:27:30 +0000 (09:27 +0000)]
avfilter/af_ladspa: process all channels for nb_handles > 1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agodoc/filters: ladspa: add two more examples, this time using SWH plugins
Paul B Mahol [Tue, 15 Sep 2015 20:36:00 +0000 (20:36 +0000)]
doc/filters: ladspa: add two more examples, this time using SWH plugins

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/vaapi_internal: Add missing include
Timo Rothenpieler [Wed, 16 Sep 2015 09:39:41 +0000 (11:39 +0200)]
avcodec/vaapi_internal: Add missing include

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
4 years agoavcodec/libxvid: add missing include
Michael Niedermayer [Wed, 16 Sep 2015 09:37:57 +0000 (11:37 +0200)]
avcodec/libxvid: add missing include

Fix build

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e'
Hendrik Leppkes [Wed, 16 Sep 2015 09:31:40 +0000 (11:31 +0200)]
Merge commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e'

* commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e':
  jpeg2000: Split codeblock decoding from the main tile decoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '6536da7371b4847a2824ed46b98829f127f24dad'
Hendrik Leppkes [Wed, 16 Sep 2015 09:31:11 +0000 (11:31 +0200)]
Merge commit '6536da7371b4847a2824ed46b98829f127f24dad'

* commit '6536da7371b4847a2824ed46b98829f127f24dad':
  doc: Add travis badge

Not merged as ffmpeg does not have travis officially setup.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b'
Hendrik Leppkes [Wed, 16 Sep 2015 09:27:20 +0000 (11:27 +0200)]
Merge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b'

* commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b':
  mpegvideo: Drop mpegvideo.h where not needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '5d14cf199990cd378904a2618b5c72c4b02290f6'
Hendrik Leppkes [Wed, 16 Sep 2015 09:23:40 +0000 (11:23 +0200)]
Merge commit '5d14cf199990cd378904a2618b5c72c4b02290f6'

* commit '5d14cf199990cd378904a2618b5c72c4b02290f6':
  mpegvideo: Make sure mpegutils.h is included where needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '525f58977c93e189fda49a5c4928feaf4d89fac6'
Hendrik Leppkes [Wed, 16 Sep 2015 09:23:20 +0000 (11:23 +0200)]
Merge commit '525f58977c93e189fda49a5c4928feaf4d89fac6'

* commit '525f58977c93e189fda49a5c4928feaf4d89fac6':
  mpegvideo: Move macros to more appropriate headers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d'
Hendrik Leppkes [Wed, 16 Sep 2015 09:20:42 +0000 (11:20 +0200)]
Merge commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d'

* commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d':
  avfilter: Support both syntaxes for the scale filter

Not merged, ffmpeg has much more flexible option handling

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b'
Hendrik Leppkes [Wed, 16 Sep 2015 09:19:36 +0000 (11:19 +0200)]
Merge commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b'

* commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b':
  lavr: Remove unreachable code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'dc54c78c4d56cdf5549f35ccff2fd66e7ffa0af2'
Hendrik Leppkes [Wed, 16 Sep 2015 09:19:17 +0000 (11:19 +0200)]
Merge commit 'dc54c78c4d56cdf5549f35ccff2fd66e7ffa0af2'

* commit 'dc54c78c4d56cdf5549f35ccff2fd66e7ffa0af2':
  buffersrc: Improve initialization log message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '2c6014c629346ebfeb25fc715581a8df9175f71f'
Hendrik Leppkes [Wed, 16 Sep 2015 09:18:28 +0000 (11:18 +0200)]
Merge commit '2c6014c629346ebfeb25fc715581a8df9175f71f'

* commit '2c6014c629346ebfeb25fc715581a8df9175f71f':
  fate: Change global error option to private error_rate option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e'
Hendrik Leppkes [Wed, 16 Sep 2015 09:14:37 +0000 (11:14 +0200)]
Merge commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e'

* commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e':
  fate: Move mv0 option from global to mpv private

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac'
Hendrik Leppkes [Wed, 16 Sep 2015 09:12:32 +0000 (11:12 +0200)]
Merge commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac'

* commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac':
  lavc: Keep idct integer option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e'
Hendrik Leppkes [Wed, 16 Sep 2015 09:12:07 +0000 (11:12 +0200)]
Merge commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e'

* commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e':
  avconv_filter: Use full named options

Not merged, as ffmpeg option syntax is quite different.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '10de408738d28ab17aa5c1fdccd809b0637c12d5'
Hendrik Leppkes [Wed, 16 Sep 2015 09:06:55 +0000 (11:06 +0200)]
Merge commit '10de408738d28ab17aa5c1fdccd809b0637c12d5'

* commit '10de408738d28ab17aa5c1fdccd809b0637c12d5':
  lavf: Update to the new crypto API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agortsp: warning when max_delay reached
Eloi BAIL [Tue, 15 Sep 2015 15:38:23 +0000 (11:38 -0400)]
rtsp: warning when max_delay reached

packets are queued due to packet reordering until the queue reach its
maximal size or max delay is reached.
This commit adds a warning trace when max delay is reached.

Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: inform jitter buffer size
Eloi BAIL [Tue, 15 Sep 2015 15:38:22 +0000 (11:38 -0400)]
rtpdec: inform jitter buffer size

This commit print as AV_LOG_VERBOSE the jitter buffer
size. It might be the default value or the value set by application.

Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: add a trace when jitter buffer is full
Eloi BAIL [Tue, 15 Sep 2015 15:38:21 +0000 (11:38 -0400)]
rtpdec: add a trace when jitter buffer is full

This commit adds a warning trace when jitter buffer
is full. It helps to understand leading decoding issues.

Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavformat/flvdec: Check that sizes match and resync if not
Michael Niedermayer [Tue, 15 Sep 2015 23:58:10 +0000 (01:58 +0200)]
avformat/flvdec: Check that sizes match and resync if not

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/rtmpproto: Fix 2nd packet size
Michael Niedermayer [Wed, 16 Sep 2015 01:42:47 +0000 (03:42 +0200)]
avformat/rtmpproto: Fix 2nd packet size

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/flvdec: Change packet loop to return EAGAIN instead of looping until a valid...
Michael Niedermayer [Tue, 15 Sep 2015 23:39:18 +0000 (01:39 +0200)]
avformat/flvdec: Change packet loop to return EAGAIN instead of looping until a valid packet is foud

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: make assignment of variable to '=' explicit
Ganesh Ajjanagadde [Sun, 13 Sep 2015 06:26:04 +0000 (02:26 -0400)]
configure: make assignment of variable to '=' explicit

op== is confusing, as it may easily be mistook for an equality check,
while in reality it is doing an assigment to '='.
This patch has the additional benefit of cleaning up 2 warnings from shellcheck.net.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agolibavformat/riff.c: Add support for RV40 codec in AVI
Thierry Foucu [Tue, 15 Sep 2015 21:11:38 +0000 (14:11 -0700)]
libavformat/riff.c: Add support for RV40 codec in AVI

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agocheckasm: add vp9 intra pred tests.
Ronald S. Bultje [Tue, 15 Sep 2015 20:26:33 +0000 (16:26 -0400)]
checkasm: add vp9 intra pred tests.

4 years agocheckasm: add vp9 MC tests.
Ronald S. Bultje [Tue, 15 Sep 2015 20:41:29 +0000 (16:41 -0400)]
checkasm: add vp9 MC tests.

4 years agoavfilter/vf_stereo3d: simplify blank calculations and check height
Paul B Mahol [Tue, 15 Sep 2015 18:55:47 +0000 (18:55 +0000)]
avfilter/vf_stereo3d: simplify blank calculations and check height

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavc/utils: Correctly show bit_rate >INT_MAX.
Carl Eugen Hoyos [Tue, 15 Sep 2015 18:56:23 +0000 (20:56 +0200)]
lavc/utils: Correctly show bit_rate >INT_MAX.

Fixes ticket #2089.

4 years agoavcodec/ffv1enc: Fix error message when the requested version does not support the...
Michael Niedermayer [Tue, 15 Sep 2015 18:27:14 +0000 (20:27 +0200)]
avcodec/ffv1enc: Fix error message when the requested version does not support the requested features

Found-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vsrc_cellauto: use the name 's' for the pointer to the private context
Ganesh Ajjanagadde [Fri, 28 Aug 2015 05:31:02 +0000 (01:31 -0400)]
avfilter/vsrc_cellauto: use the name 's' for the pointer to the private context

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoREADME.md: avoid Github pull requests
Lou Logan [Mon, 14 Sep 2015 21:24:22 +0000 (13:24 -0800)]
README.md: avoid Github pull requests

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
4 years agoavfilter/f_sendcmd: use the name 's' for the pointer to the private context
Ganesh Ajjanagadde [Wed, 9 Sep 2015 18:30:35 +0000 (14:30 -0400)]
avfilter/f_sendcmd: use the name 's' for the pointer to the private context

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
4 years agoavfilter/af_stereowiden: fix 2nd argument for av_calloc
Paul B Mahol [Tue, 15 Sep 2015 16:27:52 +0000 (16:27 +0000)]
avfilter/af_stereowiden: fix 2nd argument for av_calloc

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavf: Switch probesize and max_analyze_duration to 64bit.
Carl Eugen Hoyos [Tue, 15 Sep 2015 15:36:38 +0000 (17:36 +0200)]
lavf: Switch probesize and max_analyze_duration to 64bit.

Both are only accessible through AVOptions.

4 years agolavf: Switch bitrate to 64bit unless compatibility with avconv was requested.
Carl Eugen Hoyos [Tue, 15 Sep 2015 15:29:38 +0000 (17:29 +0200)]
lavf: Switch bitrate to 64bit unless compatibility with avconv was requested.

Based on a patch by Steve Swanson, swanysteve at gmail.

Fixes ticket #2089.

4 years agolavc: Switch bitrate to 64bit unless compatibility with avconv was requested.
Michael Niedermayer [Tue, 15 Sep 2015 16:01:32 +0000 (18:01 +0200)]
lavc: Switch bitrate to 64bit unless compatibility with avconv was requested.

4 years agodoc/filters: mention newly added windowing functions
Paul B Mahol [Tue, 15 Sep 2015 15:22:33 +0000 (15:22 +0000)]
doc/filters: mention newly added windowing functions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_vidstabdetect: use the name 's' for the pointer to the private context
Ganesh Ajjanagadde [Mon, 7 Sep 2015 14:10:06 +0000 (10:10 -0400)]
avfilter/vf_vidstabdetect: use the name 's' for the pointer to the private context

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
4 years agovp9: switch min_tile_cols location so it shifts up instead of down.
Ronald S. Bultje [Mon, 14 Sep 2015 18:50:47 +0000 (14:50 -0400)]
vp9: switch min_tile_cols location so it shifts up instead of down.

This fixes cases where the shifted number is 64, but we shifted non-
zero numbers away in the shift. The change makes behaviour consistent
with libvpx.

4 years agortpdec: add a trace when jitter buffer is full
Eloi BAIL [Mon, 14 Sep 2015 18:02:16 +0000 (14:02 -0400)]
rtpdec: add a trace when jitter buffer is full

This commit adds an error trace when jitter buffer
is full. It helps to understand leading decoding issues.

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