Clément Bœsch
ed223eeab3
Merge commit ' d42809f983'
...
* commit 'd42809f983 ':
av1: Add codec_id and basic demuxing support
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 18:28:40 +01:00
Clément Bœsch
ca619cdf54
Merge commit ' 221402c1c8'
...
* commit '221402c1c8 ':
pcx: check that the packet is large enough before reading the header
See 8cd1c0febe
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:55:06 +01:00
Clément Bœsch
d707e667c5
Merge commit ' 409d1cd2c9'
...
* commit '409d1cd2c9 ':
cook: use the bytestream2 API for reading extradata
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:47:19 +01:00
Clément Bœsch
a0220d949f
Merge commit ' bba9d8bdfb'
...
* commit 'bba9d8bdfb ':
qpeg: fix an off by 1 error in the MV check
See dd3bfe3cc1
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:39:49 +01:00
Clément Bœsch
f09aa73b30
Merge commit ' 796dca027b'
...
* commit '796dca027b ':
alac: do not return success if nothing was decoded
See e11983bda0
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:36:37 +01:00
Clément Bœsch
1080b7162f
Merge commit ' f5d46d3322'
...
* commit 'f5d46d3322 ':
vmnc: check that subrectangles fit into their containing rectangles
See 6ba02602aa
This merge keeps our condition against w-i and h-j instead of bw and bh.
One may be more correct than the other, but I'm keeping our behaviour
here for safety reasons.
The style and formatting is merged.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:24:49 +01:00
Clément Bœsch
01e188762f
Merge commit ' 83b92a855e'
...
* commit '83b92a855e ':
golomb: Drop disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:12:41 +01:00
Clément Bœsch
a754fae4a7
Merge commit ' 014852e932'
...
* commit '014852e932 ':
simple_idct: arm: Drop disabled code variant
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:12:07 +01:00
Clément Bœsch
8695ce73ca
Merge commit ' e2b9993558'
...
* commit 'e2b9993558 ':
simple_idct: x86: Drop disabled IDCT implementation
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:11:11 +01:00
Clément Bœsch
ff66ba6feb
Merge commit ' 7effebde78'
...
* commit '7effebde78 ':
dvbsubdec: Remove disabled, near-duplicate debug code
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:10:17 +01:00
Clément Bœsch
adef752f1b
Merge commit ' 0e285c2f90'
...
* commit '0e285c2f90 ':
mpegvideo: Kill some disabled code
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:07:30 +01:00
Clément Bœsch
95a29b1a82
Merge commit ' f2f145f303'
...
* commit 'f2f145f303 ':
msmpeg4: Drop disabled debug cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:06:49 +01:00
Clément Bœsch
87cd8dc0b0
Merge commit ' be1db21ba8'
...
* commit 'be1db21ba8 ':
mathops: Drop disabled alternative mid_pred() implementation
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:05:13 +01:00
Clément Bœsch
1a48a51bfc
Merge commit ' b53d8c3ccf'
...
* commit 'b53d8c3ccf ':
mjpegdec: Drop disabled code
The last chunk is replaced with a comment describing the structure.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:03:25 +01:00
Clément Bœsch
7a6514861e
Merge commit ' 34c22a9ca6'
...
* commit '34c22a9ca6 ':
faan(i)dct: Kill some disabled code
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:00:21 +01:00
Clément Bœsch
2f42aef3e4
Merge commit ' 17cb56b356'
...
* commit '17cb56b356 ':
ffv1: Remove broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:58:43 +01:00
Clément Bœsch
b6e88bf323
Merge commit ' b96f0ab3d2'
...
* commit 'b96f0ab3d2 ':
h264: Kill broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:56:19 +01:00
Clément Bœsch
842e7853c7
Merge commit ' 42c4c2d2a6'
...
* commit '42c4c2d2a6 ':
aac: Drop broken cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:54:44 +01:00
Clément Bœsch
92cd2c04b1
Merge commit ' 263efc095e'
...
* commit '263efc095e ':
jfdct: Kill broken cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:50:17 +01:00
Clément Bœsch
4ded6f9b31
Merge commit ' dab2034b86'
...
* commit 'dab2034b86 ':
roqvideoenc: Drop broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:49:15 +01:00
Clément Bœsch
8a403b00d1
Merge commit ' 562bec0e69'
...
* commit '562bec0e69 ':
pnm_parser: Drop broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:48:50 +01:00
Clément Bœsch
18cdef9ab7
Merge commit ' a972fc1c0a'
...
* commit 'a972fc1c0a ':
wma: Kill non-compiling disabled cruft
See 0755033f8a
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:42:55 +01:00
Clément Bœsch
efcba5a06a
Merge commit ' d5fda00efa'
...
* commit 'd5fda00efa ':
mpeg4videoenc: Kill non-compiling disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 13:48:07 +01:00
Clément Bœsch
3f04964671
Merge commit ' e4d5b55193'
...
* commit 'e4d5b55193 ':
rangecoder: Kill non-compiling disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 13:44:04 +01:00
Clément Bœsch
822f1a7913
Merge commit ' e9bfff1cc6'
...
* commit 'e9bfff1cc6 ':
lavc: free buffer_frame/pkt on avcodec_open2() failure
This commit is a noop, see 27adf9f9cd .
Only reordered to reduce diff.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:27:56 +01:00
Carl Eugen Hoyos
9e6b269fea
lavc/avcodec: Constify AVBitStreamFilter* in AVBitStreamFilterContext struct.
...
Fixes a gcc warning:
libavcodec/bitstream_filter.c:71:20: warning: assignment discards 'const' qualifier from pointer target type
2017-03-17 23:46:47 +01:00
Tobias Rapp
205b8fd078
avcodec: estimate output bitrate for uncompressed video codecs
...
Allows to get a more realistic total bitrate (and estimated file size)
in avi_write_header. Previously a static default value of 200k was
assumed.
Adds an internal helper function for bitrate guessing.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-17 11:55:16 +01:00
Konda Raju
2db5ab73d4
avcodec/nvenc: allow different const-qps for I, P and B frames
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
2017-03-17 10:42:55 +01:00
wm4
b4b8ca24f6
avcodec: fix uninitialized variable read
...
This cna happen if the user tries to call the new decode API for
subtitles.
Fixes CID 1402071.
2017-03-17 00:29:03 +01:00
Carl Eugen Hoyos
5dd7ea9f56
lavc/internal: Constify AVPacket* in AVCodecInternal.
...
Fixes a gcc warning:
libavcodec/utils.c:2244:26: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2017-03-16 21:14:34 +01:00
Carl Eugen Hoyos
0d34dbc272
lavc/avpacket: Make pkt parameter of av_packet_get_side_data() const.
...
Reflects the actual code and silences a gcc warning:
libavcodec/utils.c:2102:36: warning: passing argument 1 of 'av_packet_get_side_data' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2017-03-16 21:09:41 +01:00
Clément Bœsch
8286c359ad
Merge commit ' e99ecda550'
...
* commit 'e99ecda550 ':
checkasm: add vp9 MC tests.
vp9mc/x86: sse2 MC assembly.
vp9mc/x86: add AVX and AVX2 MC
vp9mc/x86: rename ff_* to ff_vp9_*
vp9mc/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext
vp9mc/x86: simplify a few inits.
vp9mc/x86: add 16px functions (64bit only).
Noop (aside from a formatting comment in vp9mc.asm). We already have all
of this. We should consider making a final diff between the two projects
when the dust comes down.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-16 20:25:39 +01:00
Clément Bœsch
a4f5e79f7c
Merge commit ' 89466de4ae'
...
* commit '89466de4ae ':
vp9/x86: rename vp9dsp to vp9mc
File was already renamed, only the top description is updated.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-16 20:10:47 +01:00
Michael Niedermayer
a3a4082599
avcodec/h264_cabac: Fix runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself
...
Fixes: 858/clusterfuzz-testcase-5168477042114560
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-16 16:16:05 +01:00
Michael Niedermayer
2898bc522d
avcodec/h264idct_template: fix multiple runtime error: signed integer overflow
...
Fixes: 857/clusterfuzz-testcase-5319093760557056
Benchmark changes from 335->333 (so if its not a random fluctuation then it would be faster)
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-16 16:16:05 +01:00
Matthieu Bouron
0c6105dde0
lavc/tests/dct/aarch64: add ff_simple_idct_neon test
2017-03-16 12:00:41 +01:00
Matthieu Bouron
4c8e528d19
lavc/aarch64: add ff_simple_idct{,_add,_put}_neon functions
2017-03-16 12:00:41 +01:00
James Almer
6c4665deb4
Merge commit ' 89aebc5bcc'
...
* commit '89aebc5bcc ':
lavc: align the linesize to 32 when AVX is enabled
Merged-by: James Almer <jamrial@gmail.com>
2017-03-15 22:16:53 -03:00
James Almer
e632fe9bab
Merge commit ' 3c504bc359'
...
* commit '3c504bc359 ':
x86: deduplicate some constants
Merged-by: James Almer <jamrial@gmail.com>
2017-03-15 22:07:28 -03:00
James Almer
e298497f0c
Merge commit ' 3ccec334b8'
...
* commit '3ccec334b8 ':
sbrdsp: Move a misplaced #endif directive to the right spot
Merged-by: James Almer <jamrial@gmail.com>
2017-03-15 21:37:40 -03:00
Michael Niedermayer
cfa10e11be
avcodec/tiff: Check palette shift
...
Fixes multiple runtime error: shift exponent 792 is too large for 32-bit type 'unsigned int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-16 01:04:35 +01:00
Michael Niedermayer
58e9c7f4a2
avcodec/wavpack: Fix multiple integer overflows
...
Fixes: 839/clusterfuzz-testcase-4871084446842880
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-16 01:04:35 +01:00
Michael Niedermayer
45198477de
avcodec/simple_idct_template: Fix several integer overflows
...
Benchmarks with START_TIMER indicate that the code is faster with unsigned, (that is
with the patch), there was quite some fluctuation in the numbers so this may be just
random
Fixes: 811/clusterfuzz-testcase-6465493076541440
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-16 01:04:35 +01:00
Clément Bœsch
d96f6df3a6
Merge commit ' 7ebdffc353'
...
* commit '7ebdffc353 ':
dxv: Check to make sure we don't overrun buffers on corrupt inputs
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15 23:26:10 +01:00
Clément Bœsch
aabe525734
Merge commit ' e328178da9'
...
* commit 'e328178da9 ':
qsvdec: only access hwaccel_context is the pixel format is QSV
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15 23:22:50 +01:00
Clément Bœsch
4ac44520e5
Merge commit ' 8495d84f01'
...
* commit '8495d84f01 ':
ac3dec: Add some inline hints
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15 21:58:13 +01:00
Clément Bœsch
151b5e4a53
Merge commit ' 3db51bf671'
...
* commit '3db51bf671 ':
ac3dec: Simplify skipping
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15 21:57:57 +01:00
Clément Bœsch
2e3221c303
Merge commit ' f0ccc65bc9'
...
* commit 'f0ccc65bc9 ':
ac3dec: Split coupling-specific code from decode_audio_block()
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15 21:56:47 +01:00
Clément Bœsch
7c4dbd1df9
Merge commit ' a5ebe5d121'
...
* commit 'a5ebe5d121 ':
ac3dec: Split spx-specific code from decode_audio_block()
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15 21:43:59 +01:00
Clément Bœsch
e40fd81809
Merge commit ' a115eb9e75'
...
* commit 'a115eb9e75 ':
mimic: do not release the newly obsolete reference at the end of decoding
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15 21:23:30 +01:00