Hendrik Leppkes
7c46f24bde
Merge commit ' e3d4784eb3'
...
* commit 'e3d4784eb3 ':
d3d11va: WindowsPhone requires a mutex around ID3D11VideoContext
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17 11:31:40 +02:00
Paul B Mahol
695ff5dc6d
avfilter/af_sidechaincompress: use doubles instead of floats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-17 09:30:50 +00:00
Paul B Mahol
ddf378895f
avfilter: add stereo tools filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-17 09:30:50 +00:00
Hendrik Leppkes
ea33b1ea30
Merge commit ' 781a25e9c4'
...
* commit '781a25e9c4 ':
checkasm: v210: Fix array overwrite
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17 11:28:19 +02:00
Hendrik Leppkes
e8fbd80e14
Merge commit ' 4a66422450'
...
* commit '4a66422450 ':
pixfmt: Add new SMPTE color primaries and transfer characteristic values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17 11:27:23 +02:00
Hendrik Leppkes
04eff96822
Merge commit ' 7778859835'
...
* commit '7778859835 ':
dcadec: set channel layout in a separate function
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17 11:21:07 +02:00
Hendrik Leppkes
ecaa6cf7b8
Merge commit ' 971177f751'
...
* commit '971177f751 ':
dcadec: scan for extensions in a separate function
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17 11:08:22 +02:00
Hendrik Leppkes
157969321a
Merge commit ' 22cc57da64'
...
* commit '22cc57da64 ':
rtpdec: Forward the memory failure
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17 11:01:16 +02:00
Steve Lhomme
e3d4784eb3
d3d11va: WindowsPhone requires a mutex around ID3D11VideoContext
2015-09-17 10:33:21 +02:00
Henrik Gramner
781a25e9c4
checkasm: v210: Fix array overwrite
2015-09-17 10:33:06 +02:00
Kevin Wheatley
4a66422450
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>
2015-09-17 10:31:43 +02:00
Timothy Gu
d36eac698f
Revert "avformat/format: silence -Wdiscarded-qualifiers"
...
This reverts commit 27cbe4588a .
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>
2015-09-16 19:53:13 -07:00
Claudio Freire
8df9bf8e39
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.
2015-09-16 23:14:26 -03:00
Ronald S. Bultje
344d519040
vp9: add subpel MC SIMD for 10/12bpp.
2015-09-16 21:11:34 -04:00
Ronald S. Bultje
77f359670f
vp9: add fullpel (avg) MC SIMD for 10/12bpp.
2015-09-16 21:11:34 -04:00
Ronald S. Bultje
6354ff0383
vp9: add fullpel (put) MC SIMD for 10/12bpp.
2015-09-16 21:11:34 -04:00
Michael Niedermayer
d64f7d4213
avformat/avidec: disable parsing for RV40
...
Fixes: broken_rv40.avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-17 02:08:15 +02:00
Michael Niedermayer
fa5358f07d
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>
2015-09-17 02:08:15 +02:00
Ganesh Ajjanagadde
80d23d9d32
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>
2015-09-16 16:31:29 -07:00
Ganesh Ajjanagadde
9aaa54135c
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>
2015-09-16 16:29:51 -07:00
Ganesh Ajjanagadde
27cbe4588a
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>
2015-09-16 16:24:56 -07:00
Timothy Gu
712235dd8f
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>
2015-09-16 16:22:24 -07:00
Alexandra Hájková
7778859835
dcadec: set channel layout in a separate function
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-09-16 20:21:07 +02:00
Alexandra Hájková
971177f751
dcadec: scan for extensions in a separate function
...
to make dca_decode_frame more readable
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-09-16 20:21:07 +02:00
Luca Barbato
22cc57da64
rtpdec: Forward the memory failure
...
And avoid a memory leak.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-09-16 20:20:16 +02:00
Rostislav Pehlivanov
5ba811bdf0
aacenc_tns: fix coefficient compression condition
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2015-09-16 17:48:02 +01:00
Michael Niedermayer
a860adb49c
tests/checkasm/vp9dsp: Use snprintf() for safetey
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-16 14:19:37 +02:00
Hendrik Leppkes
78af3ffaa9
Merge commit ' 1ec611a102'
...
* commit '1ec611a102 ':
rtsp: warning when max_delay reached
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:11:24 +02:00
Hendrik Leppkes
85c85d453d
Merge commit ' d555bd69e7'
...
* commit 'd555bd69e7 ':
rtpdec: inform jitter buffer size
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:11:06 +02:00
Hendrik Leppkes
3d481f39a2
Merge commit ' ff7f6ea9db'
...
* commit 'ff7f6ea9db ':
rtpdec: add a trace when jitter buffer is full
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:10:27 +02:00
Hendrik Leppkes
7cecab2f88
Merge commit ' 3c525b8b47'
...
* commit '3c525b8b47 ':
rtpdec: Increase the max size of the jitter buffer to 500 packets
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:07:05 +02:00
Hendrik Leppkes
b2a72e8ab9
Merge commit ' 570fcaf332'
...
* commit '570fcaf332 ':
jpeg2000: Factor out prec init
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:04:46 +02:00
Carl Eugen Hoyos
f17ca46009
lavf/riff: Support decoding Ambisonic wav files.
...
Reported and tested by Andy Furniss, adf d lists at gmail
2015-09-16 14:03:13 +02:00
Hendrik Leppkes
2fc552b629
Merge commit ' 95a41311ac'
...
* commit '95a41311ac ':
jpeg2000: Factor out band stepsize initialization
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 14:01:58 +02:00
Hendrik Leppkes
054ce2d6ab
Merge commit ' 7fb93eae43'
...
* commit '7fb93eae43 ':
jpeg2000: Factor out band initialization
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 13:58:30 +02:00
Hendrik Leppkes
8f80f3d074
Merge commit ' 1b709f23fb'
...
* commit '1b709f23fb ':
jpeg2000: Refactor decode_packets
Not merged, as the ffmpeg code is much more advanced.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 13:57:50 +02:00
Henrik Gramner
6115966ad3
checkasm: v210: Fix array overwrite
2015-09-16 13:50:09 +02:00
Henrik Gramner
985e7d8cc1
checkasm: v210: s/Libav/FFmpeg/
2015-09-16 13:48:43 +02:00
Hendrik Leppkes
64f72bb61f
Merge commit ' 29b00f880f'
...
* commit '29b00f880f ':
jpeg2000: Templatize the frame writer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 12:08:39 +02:00
Paul B Mahol
dc1050a3e8
avfilter/af_ladspa: process all channels for nb_handles > 1
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-16 09:45:59 +00:00
Paul B Mahol
03f34e0d3c
doc/filters: ladspa: add two more examples, this time using SWH plugins
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-16 09:45:59 +00:00
Timo Rothenpieler
dad38bff81
avcodec/vaapi_internal: Add missing include
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
2015-09-16 11:41:07 +02:00
Michael Niedermayer
fee2b97d56
avcodec/libxvid: add missing include
...
Fix build
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-16 11:38:20 +02:00
Hendrik Leppkes
5a754f92d1
Merge commit ' 41bcc3d152'
...
* commit '41bcc3d152 ':
jpeg2000: Split codeblock decoding from the main tile decoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:31:40 +02:00
Hendrik Leppkes
5de28d341f
Merge commit ' 6536da7371'
...
* commit '6536da7371 ':
doc: Add travis badge
Not merged as ffmpeg does not have travis officially setup.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:31:11 +02:00
Hendrik Leppkes
52ce8b7b31
Merge commit ' e60a6e7545'
...
* commit 'e60a6e7545 ':
mpegvideo: Drop mpegvideo.h where not needed
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:27:20 +02:00
Hendrik Leppkes
7b865c222e
Merge commit ' 5d14cf1999'
...
* commit '5d14cf1999 ':
mpegvideo: Make sure mpegutils.h is included where needed
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:23:40 +02:00
Hendrik Leppkes
b3ff8ef6ec
Merge commit ' 525f58977c'
...
* commit '525f58977c ':
mpegvideo: Move macros to more appropriate headers
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:23:20 +02:00
Hendrik Leppkes
643a156002
Merge commit ' 285fe5b098'
...
* commit '285fe5b098 ':
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>
2015-09-16 11:20:42 +02:00
Hendrik Leppkes
c2972a2800
Merge commit ' c7247eb7fe'
...
* commit 'c7247eb7fe ':
lavr: Remove unreachable code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:19:36 +02:00