Michael Niedermayer
78b5479633
Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053'
...
* commit '502ab21af0ca68f76d6112722c46d2f35c004053':
x86: lpc: simd av_update_lls
The versions are bumped due to changes in lls.h which is used across
libraries affecting intra library ABI
(This version bump also covers changes to lls.h in the immedeatly previous
commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 11:35:52 +02:00
Michael Niedermayer
c93a424718
Merge commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2'
...
* commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2':
lpc: use function pointers, in preparation for asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 11:23:43 +02:00
Michael Niedermayer
d3bd320e63
Merge commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b'
...
* commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b':
lpc: remove "decay" argument
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 10:54:20 +02:00
Luca Barbato
6765ee7b9c
mjpeg: Check the unescaped size for overflows
...
And contextually check init_get_bits success and fix the reporting
message.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-30 08:48:51 +02:00
Luca Barbato
7520d9779c
mjpeg: Move code out of else branch
...
Simplify the control flow and spare some vertical space.
2013-06-30 08:46:55 +02:00
Michael Niedermayer
ff130d7363
get_xbits: assert validity of the number of bits
...
similar is already done in the other get_bits() functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 01:40:18 +02:00
Michael Niedermayer
68efb1d60a
4xm: Dont ignore dc run errors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 01:35:22 +02:00
Michael Niedermayer
13c56e9a9c
4xm: check for invalid zero ac coeffs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 01:35:22 +02:00
Michael Niedermayer
6d6eabd399
mjpeg_decode_dc: check code before using it in get_xbits()
...
Fixes undefined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 01:35:22 +02:00
Derek Buitenhuis
58950ca0df
ffmpeg: Don't include colorspace.h
...
The header is private, and ffmpeg.c doesn't use it
for anything.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-06-29 16:44:12 -04:00
Michael Niedermayer
a2802d3cd4
get_pix_fmt_score: favor equal formats if all else equal
...
Fixes Ticket2578
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 22:20:20 +02:00
Derek Buitenhuis
7798a59dc1
avconv: Don't include colorspace.h
...
The header is private, and avconv.c doesn't use it
for anything.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-06-29 14:24:02 -04:00
Michael Niedermayer
7f866c14ba
update all trac links to use the trac subdomain
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 19:27:49 +02:00
Michael Niedermayer
a2e50fa068
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Avoid a null pointer dereference on clean-up after oom in ac3 encoder.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 19:16:49 +02:00
Luca Barbato
02ec656af7
wmapro: error out on impossible scale factor offsets
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-29 18:11:59 +02:00
Luca Barbato
d4a217a408
wmapro: check the min_samples_per_subframe
...
Must be at least WMAPRO_BLOCK_MIN_SIZE.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-29 18:11:40 +02:00
Luca Barbato
183880cfc4
pictor: use the correct logging context
...
Broken in 6d97484d72
2013-06-29 18:11:12 +02:00
Reuben Martin
2fa89b2736
Added codec ID to playback DNxHD
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 18:02:37 +02:00
Carl Eugen Hoyos
225f78b7ef
Avoid a null pointer dereference on clean-up after oom in ac3 encoder.
2013-06-29 17:50:07 +02:00
Carl Eugen Hoyos
90bd75e6eb
Avoid a null pointer dereference on oom when decoding smacker.
...
Fixes ticket #2728 .
2013-06-29 16:04:07 +02:00
Carl Eugen Hoyos
a1dbe49d02
Propagate error return values from the smacker decoder.
2013-06-29 16:02:43 +02:00
Carl Eugen Hoyos
ac83d62136
Avoid a null pointer dereference on oom when decoding vc1.
...
Fixes ticket #2723 .
2013-06-29 14:49:47 +02:00
Stefano Sabatini
d47168e729
doc/muxers: apply various minor fixes to segment documentation
2013-06-29 14:12:11 +02:00
Stefano Sabatini
f150db096d
doc/muxers: sort muxers by name
2013-06-29 14:12:11 +02:00
Loren Merritt
c93ccf5a4c
lpc: use levinson for the first pass of multipass cholesky
...
Levinson is faster, and cholesky is only needed if we want to apply different
weights to different samples, which doesn't happen on the first pass.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-06-29 13:26:52 +02:00
Loren Merritt
b545179fdf
x86: lpc: simd av_evaluate_lls
...
1.5x-1.8x faster on sandybridge
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-06-29 13:23:57 +02:00
Loren Merritt
502ab21af0
x86: lpc: simd av_update_lls
...
4x-6x faster on sandybridge
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-06-29 13:23:57 +02:00
Loren Merritt
41578f70cf
lpc: use function pointers, in preparation for asm
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-06-29 13:23:57 +02:00
Loren Merritt
cc6714bb16
lpc: remove "decay" argument
...
We never used the rolling-average mode, and this makes av_update_lls 15% faster.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-06-29 13:23:57 +02:00
Michael Niedermayer
a3e9f4c32a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wmapro: check num_vec_coeffs against the actual available buffer
Conflicts:
libavcodec/wmaprodec.c
The check is replaced by an assert.
See: b21ba20cc8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 12:23:56 +02:00
Michael Niedermayer
562e8d019b
Merge commit '6652338f43ef623045912d7f28b61adea05d27ae'
...
* commit '6652338f43ef623045912d7f28b61adea05d27ae':
wmapro: return early on unsupported condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 11:47:26 +02:00
Michael Niedermayer
3e33db3f65
Merge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea'
...
* commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea':
wmapro: make sure there is room to store the current packet
The check is replaced by an assert as it is impossible to occur
See: 780d45473c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 11:37:09 +02:00
Michael Niedermayer
c1343897c3
Merge commit 'afe03092dd693d025d43e1620283d8d285c92772'
...
* commit 'afe03092dd693d025d43e1620283d8d285c92772':
lavc: move put_bits_left in put_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 10:59:04 +02:00
Michael Niedermayer
53fd1ab26b
avformat: make av_register_*put_format() thread safe
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 03:46:10 +02:00
Michael Niedermayer
b36b5edb8f
avcodec/bitstream_filter: make av_register_bitstream_filter() thread safe
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 03:39:03 +02:00
Michael Niedermayer
08f6fdc3e4
avcodec/parser: Make av_register_codec_parser() thread safe
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 03:32:57 +02:00
Michael Niedermayer
8738d94274
avcodec: Make av_register_hwaccel() and avcodec_register() thread safe
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 03:28:58 +02:00
Timothy Gu
a9bbf59be7
cosmetics: Fix "dont" "wont" "doesnt" typos
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 02:31:16 +02:00
Michael Chinen
fc736a99ea
flac_parser.c: fix case when final frame is a false positive
...
Should fix https://ffmpeg.org/trac/ffmpeg/ticket/2552
Only did minimal testing on a few files and fate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 00:31:14 +02:00
Michael Niedermayer
804c7b2c62
udp: Fix receiving large udp packets
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 00:10:15 +02:00
Paul B Mahol
36748d4b6c
tak_parser: properly mark packets as key frames
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-28 21:31:14 +00:00
Carl Eugen Hoyos
2bccd82c29
Do not list libshine like a main option in configure's output.
...
It is listed as an enabled external library if applicable.
2013-06-28 16:23:39 +02:00
Luca Barbato
3822936252
wmapro: check num_vec_coeffs against the actual available buffer
...
Prevent yet another buffer overwrite.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-28 13:16:35 +02:00
Luca Barbato
6652338f43
wmapro: return early on unsupported condition
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-28 13:16:00 +02:00
Luca Barbato
e30b068ef7
wmapro: make sure there is room to store the current packet
...
Prevent horrid and hard to trace struct overwrite.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-28 13:15:40 +02:00
Luca Barbato
afe03092dd
lavc: move put_bits_left in put_bits.h
2013-06-28 13:14:12 +02:00
Timothy Gu
7eb5288f17
doc/decoders: document libopus decoder
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-06-28 13:09:10 +02:00
Timothy Gu
934df3b037
doc/encoders: alphabetically list the encoders
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-06-28 13:07:15 +02:00
Michael Niedermayer
2236456715
avfilter/avfilter: Make avfilter_register() thread safe
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28 12:44:03 +02:00
Michael Niedermayer
16310e36d9
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Avoid a null pointer dereference in avcodec_decode_video2().
Set block_align when reading QDM2 in mov.
Fix muxing QDM2 mono into caf.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28 10:14:16 +02:00