Michael Niedermayer
dcf5bfbdb6
avcodec/vc1: Check bfraction_lut_index
...
Fixes: out of array read
Fixes: asan_static-oob_1b40507_2849_SA10143.vc1
Fixes: asan_static-oob_1b40a15_2849_cov_1182297305_SA10143.vc1
Fixes: asan_static-oob_1b40f15_2849_cov_2159513432_SA10143.vc1
Fixes: asan_static-oob_1b40f15_2849_cov_3230311510_SA10143.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-01 17:10:48 +01:00
Michael Niedermayer
388b4cf86e
avcodec/vc1: factor read_bfraction() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-01 17:06:24 +01:00
Michael Niedermayer
f4b288a639
avcodec/vc1dec: Print warning for frame pictures with direct mode MBs, followed by field pictures
...
This case is not implemented
No non fuzzed samples are known to use this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-01 06:59:35 +01:00
Michael Niedermayer
85d51d8e32
avcodec/vc1dec: field pictures with direct mode MBs, followed by frame pictures are not supported
...
This case could occur when cuting and concatenating bitstreams
Fixes out of array read
Fixes: asan_heap-oob_1b33fdd_2849_cov_478905890_SA10143.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-01 06:48:44 +01:00
Michael Niedermayer
dce93218d7
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Auto-detect hevc in mpeg-ts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 22:50:40 +01:00
Michael Niedermayer
19b41f8645
avcodec/mjpegdec: use the correct linesize in the flipping code
...
Fixes out of array access
No releases should be affected
Depends on 7c3700cd1d
, do not backport without this one
Fixes: asan_heap-oob_14a37fe_9111_cov_1692584941_test4.amv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 21:47:44 +01:00
Michael Niedermayer
f58eab1512
avcodec/takdec: always check bits_per_raw_sample
...
Fixes out of array access
Fixes: asan_heap-oob_19c7a94_6470_cov_1453611734_luckynight-partial.tak
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 19:54:27 +01:00
Ståle Kristoffersen
16097efb8c
Auto-detect hevc in mpeg-ts.
...
Fixes decoding of files without PMT/PAT.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2014-01-31 19:05:08 +01:00
Michael Niedermayer
0de9d72b7c
mxpeg_decode_end: zero bitmask size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 18:34:14 +01:00
Michael Niedermayer
2884688bd5
avcodec/mjpegdec: pass into ff_mjpeg_decode_sos() and check bitmask size
...
Fixes: heap array overread
Fixes: asan_heap-oob_149b2bc_6577_m1.mxg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 18:34:08 +01:00
Michael Niedermayer
13aa82bbbb
avformat/flac_picture: clear padding area
...
aviod use of uninitialized memory
Fixes: asan_heap-oob_1487fa4_4706_cov_364534849_cover_art.flac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 17:32:32 +01:00
Michael Niedermayer
fff2953163
avformat/flac_picture: allocate buffer padding for picture
...
Fixes: heap array overread
Fixes: asan_heap-oob_14876d9_4706_cov_815472558_cover_art.flac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 17:22:48 +01:00
Michael Niedermayer
aa36dcf534
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add xvid test for custom matrices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 15:26:53 +01:00
Michael Niedermayer
3f9e2aad34
Merge commit '7716dd9fbbcea2700a100c995df967d5547c2eb9'
...
* commit '7716dd9fbbcea2700a100c995df967d5547c2eb9':
xvid: switch to xvid mmx idct as soon as possible
Conflicts:
libavcodec/mpeg4videodec.c
Not merged, as the bug was not merged either
See: 6c9b82b6a0
, and related commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 15:18:44 +01:00
Michael Niedermayer
e53ec2fe38
Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'
...
* commit '78987a88a88b28d93d03ed6c228bcb33f178444f':
lavf: include 60 fps in guessed standard frame rates
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 14:58:28 +01:00
Michael Niedermayer
dd4237f87d
Merge commit '5312818524484a995433b986a2a7a6602572d4db'
...
* commit '5312818524484a995433b986a2a7a6602572d4db':
atrac3plus: Make initialization dependant on channel count rather than channel map
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 14:53:06 +01:00
Michael Niedermayer
8eaa66212c
Merge commit '9ee9c679a7d444db223cf932e89cd39351f54f2d'
...
* commit '9ee9c679a7d444db223cf932e89cd39351f54f2d':
x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.
See: cd86eb265f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 14:36:35 +01:00
Michael Niedermayer
de17ccc774
Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2'
...
* commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2':
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
Conflicts:
libavcodec/x86/videodsp_init.c
See: 1b3a7e1f42
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 14:30:30 +01:00
Janne Grunau
04ffd22030
fate: add xvid test for custom matrices
...
Test sample is made from the sample in Bug-Id: videolan/7411
2014-01-31 11:12:31 +01:00
Janne Grunau
7716dd9fbb
xvid: switch to xvid mmx idct as soon as possible
...
The idct implementation cannot be changed after the quantization matrices
are read since it use a different permutaion.
Bug-Id: videolan/7411
2014-01-31 11:09:11 +01:00
Janne Grunau
78987a88a8
lavf: include 60 fps in guessed standard frame rates
...
Due to what looks like an off-by-one error 60 * 12 * 1001 / 12 * 1001
is not tested as standard frame rate in avformat_find_stream_info().
2014-01-31 11:09:10 +01:00
Jan Ekström
5312818524
atrac3plus: Make initialization dependant on channel count rather than channel map
...
Makes it easier to recreate an AVCodecContext for ATRAC3+ decoding,
which is needed in multimedia frameworks, as well as in general cases
where demuxing and decoding are separate entities.
2014-01-31 11:09:10 +01:00
Michael Niedermayer
a85a718f26
doc/examples/decoding_encoding: Check all av_samples_get_buffer_size() returns
...
Fixed CID1135755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 03:27:37 +01:00
Michael Niedermayer
c89f8f80cc
avformat/hdsenc: check mkdir() return code
...
This also returns failure if the mkdir failure is not due to an already existing
path.
Fixed CID1135749
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 03:08:49 +01:00
Michael Niedermayer
2e02d71237
ffmpeg: print data size too in statistic
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 01:36:47 +01:00
Stefano Sabatini
4111856545
doc/APIchanges: apply minor formatting fixes
2014-01-31 00:48:31 +01:00
James Darnley
9a6d91b6b6
Changelog: add entries relating to metadata_header_padding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 20:37:07 +01:00
Michael Niedermayer
be7b76230f
ffmpeg: also count data streams bytes
...
Fixes wrong error message about empty output file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 20:17:10 +01:00
Clément Bœsch
c5dd73b890
x86/vp9lpf: add ff_vp9_loop_filter_h_{48,84}_16_{sse2,ssse3,avx}().
...
5.40s → 5.30s overall decode time with -threads 1 on ped1080p.webm
(i7 920, ssse3)
2014-01-30 19:34:13 +01:00
Michael Niedermayer
6dc9d2cf47
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: document correct option to list encoders
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 16:00:47 +01:00
Ronald S. Bultje
9ee9c679a7
x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.
...
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-01-30 15:33:23 +01:00
Ronald S. Bultje
51daafb02e
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
...
Should fix crashes or corrupt output on pre-SSE2 CPUs when they were
using SSE2-code (e.g. AMD Athlon XP 2400+ or Intel Pentium III) in
hfix or hvar single-edge (left/right) extension functions.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-01-30 15:30:01 +01:00
Michael Niedermayer
d85284d4aa
Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'
...
* commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7':
doc: add decoders.texi
Conflicts:
doc/decoders.texi
doc/ffmpeg.texi
doc/ffplay.texi
See: 5e45f03420
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 15:19:51 +01:00
Michael Niedermayer
3c7195a969
Merge commit '23d461fe8714a20ee5e6929f22c61512fdda568e'
...
* commit '23d461fe8714a20ee5e6929f22c61512fdda568e':
ac3dec: Allow asymmetric application of DRC when drc_scale > 1
Conflicts:
libavcodec/ac3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 14:55:03 +01:00
Carl Eugen Hoyos
3f35a31ee9
Add rangecoder to the sonic dependencies in configure.
...
Fixes compilation with --disable-everything --enable-decoder=sonic
and --disable-everything --enable-encoder=sonic.
2014-01-30 12:15:28 +01:00
Carl Eugen Hoyos
e1cb6dc59e
Warn the user if mjpeg cbr encoding with frame threading was requested.
2014-01-30 01:37:27 +01:00
Michael Niedermayer
1a5e8511d4
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Force automatic thread_count to 1 for cbr mjpeg frame threading.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 00:55:29 +01:00
Michael Niedermayer
b80073c05f
avcodec/mjpegdec: use av_freep() instead of av_free()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 00:50:43 +01:00
Michael Niedermayer
ed56c021e7
avcodec/mjpegdec Fix potential memleak of stereo3D at the end in case of decoding failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 00:25:04 +01:00
Carl Eugen Hoyos
cfc36666f6
Force automatic thread_count to 1 for cbr mjpeg frame threading.
...
Constant bit rate mjpeg encoding fails for threads > 1 and frame threading.
2014-01-30 00:22:25 +01:00
Kirill Gavrilov
e9e7e68516
mjpegdec: parse JPS extension and save relevant stereo3d information
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 00:17:02 +01:00
Michael Niedermayer
72afa381b3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avformat: utils: Refactor duplicated PRINT macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-29 23:40:51 +01:00
John Stebbins
64ba831da9
doc: document correct option to list encoders
2014-01-29 23:27:37 +01:00
John Stebbins
a17ab0e46a
doc: add decoders.texi
...
Only documents ac3 decoder options at this point.
2014-01-29 23:27:18 +01:00
John Stebbins
23d461fe87
ac3dec: Allow asymmetric application of DRC when drc_scale > 1
...
Amplification of quiet sounds is enhanced.
Inspired by gbooker's A52Decoder.
2014-01-29 23:26:25 +01:00
Michael Niedermayer
fbafd64acc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpeg: Drop unused parameters from ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-29 17:05:51 +01:00
Diego Biurrun
d67cfdeb53
avformat: utils: Refactor duplicated PRINT macro
2014-01-29 17:04:35 +01:00
Diego Biurrun
54b2ce7418
mpeg: Drop unused parameters from ff_draw_horiz_band()
2014-01-29 16:37:23 +01:00
Carl Eugen Hoyos
cfe282ec80
Remove now unneeded Makefile dependency for the wtv muxer.
2014-01-29 09:59:45 +01:00
Michael Niedermayer
29986885ef
avformat/mpegts: Continue parsing PMTs until at least 2 streams are found or 100kb are reached
...
This (ugly) hack fixes Ticket3348
If someone has an idea on how to fix this nicer, that would be very welcome
but the stream contains several PMTs with just one of the 2 streams at the start
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-29 05:44:03 +01:00