Derek Buitenhuis
61400a1dc7
Merge commit ' d909f43b5c'
...
* commit 'd909f43b5c ':
vc1dec: wmv2dec: Validate ff_intrax8_common_init return value
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:32:26 +01:00
Derek Buitenhuis
f64b53f2bf
Merge commit ' 0372e73f91'
...
* commit '0372e73f91 ':
intrax8: Check and propagate errors from ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:31:32 +01:00
Derek Buitenhuis
c29ac4abb8
Merge commit ' ad8aa8e6c6'
...
* commit 'ad8aa8e6c6 ':
intrax8: Move documentation from implementation to header file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:30:01 +01:00
Derek Buitenhuis
ba5bcf9612
Merge commit ' 2ade1cdafb'
...
* commit '2ade1cdafb ':
intrax8: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:27:53 +01:00
Derek Buitenhuis
7120bff0a3
Merge commit ' 6f5ff559db'
...
* commit '6f5ff559db ':
intrax8: Adjust printf conversion specifier for sizeof expression
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:13:30 +01:00
Derek Buitenhuis
2c3e38f44f
Merge commit ' 42244ce07a'
...
* commit '42244ce07a ':
intrax8: Move a comment to the place it corresponds
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:11:43 +01:00
Derek Buitenhuis
e445b80c74
Merge commit ' 750562549c'
...
* commit '750562549c ':
intrax8: Wrap multiline macros in do{}while(0) clauses
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:11:17 +01:00
Derek Buitenhuis
909f5e7100
Merge commit ' 0c6a70873f'
...
* commit '0c6a70873f ':
intrax8: Move error resilience out of intrax8
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:09:12 +01:00
Derek Buitenhuis
d9357332ae
Merge commit ' 64250d94b7'
...
* commit '64250d94b7 ':
indeo4: Consistently initialize variables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 18:53:11 +01:00
Derek Buitenhuis
1117d6f4b1
Merge commit ' 6202e2fede'
...
* commit '6202e2fede ':
indeo4: Rework stream analysis report
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 18:51:58 +01:00
Derek Buitenhuis
af9cac1be1
Merge commit ' 33d18982fa'
...
* commit '33d18982fa ':
lavc: add a new bitstream filtering API
Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 18:47:40 +01:00
Ronald S. Bultje
ee729cc0ed
vp9: ignore frame_context_index field in key-/intraonly-frames.
...
Reproduces a bug to remain consistent with libvpx' behaviour.
2016-04-17 09:28:56 -04:00
Paul B Mahol
7a0aee1688
avcodec/takdec: fix decoding of some sample rates with multichannel coder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-17 11:30:56 +02:00
Ivan
3a727606c4
avcodec/h264: Fix for H.264 configuration parsing
...
Sometimes video fails to decode if H.264 configuration changes mid stream.
The reason is that configuration parser assumes that nal_ref_idc is equal to 11b
while actually some codecs but 01b there. The H.264 spec is somewhat
vague about this but it looks like it allows any non-zero nal_ref_idc for sps/pps.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-17 02:39:36 +02:00
Michael Niedermayer
487c346d98
avcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declarations and code"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-17 01:52:26 +02:00
Rostislav Pehlivanov
9e138c4813
vc2enc: use 32x16 slices by default
...
Approximately 1.25 times faster than 64x32, visually and
statistically improves quality.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2016-04-16 23:59:36 +01:00
Rostislav Pehlivanov
77fb7177af
vc2enc: don't require interlacing for 1080p50/60 base video formats
...
Typo
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2016-04-16 23:59:36 +01:00
Carl Eugen Hoyos
139cbeb75e
lavc/dds: Fix GRAY8A decoding.
...
Fixes ticket #4667 .
2016-04-15 21:06:34 +02:00
Michael Niedermayer
f07923253a
avcodec/avcodec: Document signed/unsignedness of sample formats in relation to bits_per_raw_sample
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 17:58:05 +02:00
Michael Niedermayer
bcf936eaea
avcodec/utils: Add braces to framecount computation
...
Suggestes-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 15:48:02 +02:00
Michael Niedermayer
a7fa1e38ca
avcodec/utils: Fix duration of ATRAC3 packets
...
Fixes ticket1680
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 15:03:27 +02:00
Anton Khirnov
5e1a3ea3ba
lavc: move the vaapi encoders further down in the list of codecs
...
Right now they are the first encoders for those codecs in the list, so
they are selected when the caller requests a codec by id.
Since they require special treatment, they should not be selected by
default if there are other encoders (e.g. libx264/5) available.
2016-04-15 10:10:57 +02:00
Mark Thompson
92fdea3747
vaapi_h265: Add -qp option, use it to replace use of -global_quality
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-15 10:07:05 +02:00
Mark Thompson
f70e462793
vaapi_h265: Add constant-bitrate encode support
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-15 10:07:05 +02:00
Mark Thompson
fcf536b130
vaapi_h264: Add encode quality option (for quality-speed tradeoff)
...
Only supported on VAAPI 0.36 and higher.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-15 10:07:05 +02:00
Mark Thompson
9629701ce9
vaapi_h264: Add -qp option, use it to replace use of -global_quality
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-15 10:07:05 +02:00
Mark Thompson
69b06ed428
vaapi_encode: Add support for codec-local options
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-15 10:07:05 +02:00
Mark Thompson
6e8f66fc93
vaapi_h264: Add constant-bitrate encode support
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-15 10:07:05 +02:00
Mark Thompson
f6b8552369
vaapi_encode: Refactor slightly to allow easier setting of global options
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-15 10:07:04 +02:00
Michael Niedermayer
21acc4db5f
avcodec: Add bits_per_raw_sample to AVCodecParameters
...
The bits_per_raw_sample represents the number of bits of precision per sample.
The field is added at the logical place, not at the end as the code was just
recently added
This fixes the regression about losing the audio sample precision information
The change in the fate test checksum un-does the change from the merge
Previous version reviewed by: wm4 <nfxjfg@googlemail.com>
Previous version reviewed by: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 00:33:55 +02:00
Paul B Mahol
9cd2ca9966
avcodec/ralf: add support for mono
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-14 22:31:57 +02:00
Paul B Mahol
c9fb81ff41
avcodec/atrac3: pass AVCodecContext to av_log if available
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-14 18:47:57 +02:00
Michael Niedermayer
8e26bdd59b
avcodec/bmp_parser: Ensure remaining_size is not too small in startcode packet crossing corner case
...
Fixes Ticket 5438
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-14 15:28:02 +02:00
Derek Buitenhuis
7af788aa62
Merge commit ' 1098f5c049'
...
* commit '1098f5c049 ':
svq3: Use a separate buffer for decoding the slices
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-14 13:25:33 +01:00
Paul B Mahol
56759f69a6
avcodec/wmalosslessdec: improve 24bit support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-13 22:56:53 +02:00
Paul B Mahol
5ac71e9db8
avcodec/wmalosslessdec: improve >2 channel support
...
Before it worked for stereo files only.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-13 22:56:33 +02:00
Derek Buitenhuis
c182845068
Merge commit ' 92c1a83ee9'
...
* commit '92c1a83ee9 ':
qsv: Fix loading multiple plugins
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:31:36 +01:00
Derek Buitenhuis
d3e1c6f975
Merge commit ' 0242351390'
...
* commit '0242351390 ':
mpegvideo: Fix undefined negative shifts in mpeg_motion_internal
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:29:12 +01:00
Derek Buitenhuis
09dc684566
Merge commit ' e10b7ef2fe'
...
* commit 'e10b7ef2fe ':
vdpau: Add missing deprecation guards
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:22:14 +01:00
Rodger Combs
c890bcbacf
lavf/audiotoolboxdec: only provide block alignment for ILBC
...
Fixes decode errors for some AVI files
2016-04-13 03:27:29 -05:00
Rodger Combs
c11157c09a
lavf/audiotoolboxdec: only send extradata for formats that use it
...
Fixes initialization errors for some AVI files
2016-04-13 03:27:29 -05:00
Rodger Combs
acd5910e39
lavc/audiotoolboxdec: reindent
2016-04-13 03:27:29 -05:00
Rodger Combs
b20d3bf4a4
lavc/audiotoolboxdec: avoid relying on consumer-provided params when possible
2016-04-13 03:27:29 -05:00
Martin Vignali
ac07e57c39
avcodec/exr: fix huf_decode
2016-04-12 22:54:56 +02:00
Paul B Mahol
392b0a25c2
avcodec/exr: fix clearing end of bitmap
...
Inspired by patch from Martin Vignali.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-12 22:54:56 +02:00
James Almer
d7815df402
arm/rdft_init: fix license header
...
Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-12 15:01:19 -03:00
Derek Buitenhuis
2605967f7e
Merge commit ' 4c297249ac'
...
* commit '4c297249ac ':
rdft: arm: Split RDFT initialization into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-12 15:43:34 +01:00
Derek Buitenhuis
197fa698c6
Merge commit ' 97aec6e75e'
...
* commit '97aec6e75e ':
fft: arm: Drop unnecessary #include, add missing ones
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-12 15:43:09 +01:00
Derek Buitenhuis
d496d52d02
Merge commit ' 73ff983e8d'
...
* commit '73ff983e8d ':
fft: x86: cosmetics: Drop silly comments, add comment, whitespace
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-12 15:42:21 +01:00
Derek Buitenhuis
6e2ca81485
Merge commit ' ce9d7da765'
...
* commit 'ce9d7da765 ':
qsv: Move down the implementation query
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-12 15:41:46 +01:00