]>
git.sesse.net Git - ffmpeg/log
Stefano Sabatini [Mon, 1 Jul 2013 13:59:51 +0000 (15:59 +0200)]
doc/encoders: apply various fixes to libmp3lame documentation
Michael Niedermayer [Mon, 1 Jul 2013 10:03:17 +0000 (12:03 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo: check for reference when inheriting mvs
See:
4b35ee0b7c0c4cbac3541a25a5e8c00b657c8f95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 09:45:28 +0000 (11:45 +0200)]
Merge commit '
1194a410807bac3eafbeb632578b937656d273e7 '
* commit '
1194a410807bac3eafbeb632578b937656d273e7 ':
indeo5: reject negative motion vectors
The added check is wrong and thus not merged.
A correct check already exists in avcodec.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 09:37:13 +0000 (11:37 +0200)]
Merge commit '
dd3754a48854cd570d38db72394491aab0f36570 '
* commit '
dd3754a48854cd570d38db72394491aab0f36570 ':
indeo: use proper error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 09:31:16 +0000 (11:31 +0200)]
Merge commit '
7388c0c58601477db076e2e74e8b11f8a644384a '
* commit '
7388c0c58601477db076e2e74e8b11f8a644384a ':
indeo: Properly forward the error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Jean Delvare [Wed, 26 Jun 2013 12:50:37 +0000 (14:50 +0200)]
lavfi/delogo: use weighted interpolation
The original delogo algorithm interpolates both horizontally and
vertically and uses the average to compute the resulting sample. This
works reasonably well when the logo area is almost square. However
when the logo area is significantly larger than high or higher than
large, the result is largely suboptimal.
The issue can be clearly seen by testing the delogo filter with a fake
logo area that is 200 pixels large and 2 pixels high. Vertical
interpolation gives a very good result in that case, horizontal
interpolation gives a very bad result, and the overall result is poor,
because both are given the same weight.
Even when the logo is roughly square, the current algorithm gives poor
results on the borders of the logo area, because it always gives
horizontal and vertical interpolations an equal weight, and this is
suboptimal on borders. For example, in the middle of the left hand
side border of the logo, you want to trust the left known point much
more than the right known point (which the current algorithm already
does) but also much more than the top and bottom known points (which
the current algorithm doesn't do.)
By properly weighting each known point when computing the value of
each interpolated pixel, the visual result is much better, especially
on borders and/or for high or large logo areas.
The algorithm I implemented guarantees that the weight of each of the
4 known points directly depends on its distance to the interpolated
point. It is largely inspired from the original algorithm, the key
difference being that it computes the relative weights globally
instead of separating the vertical and horizontal interpolations and
combining them afterward.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Luca Barbato [Sun, 30 Jun 2013 08:40:37 +0000 (10:40 +0200)]
indeo: check for reference when inheriting mvs
The same is done already for qdelta.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sun, 30 Jun 2013 08:35:07 +0000 (10:35 +0200)]
indeo5: reject negative motion vectors
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sun, 30 Jun 2013 08:11:05 +0000 (10:11 +0200)]
indeo: use proper error code
Luca Barbato [Sun, 30 Jun 2013 07:57:56 +0000 (09:57 +0200)]
indeo: Properly forward the error codes
If the tile data size does not match the buffer size it did not
return an AVERROR_INVALIDDATA causing futher corruption later.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Carl Eugen Hoyos [Mon, 1 Jul 2013 01:07:44 +0000 (03:07 +0200)]
Avoid a null pointer dereference in avcodec_decode_audio4().
This could happen if oom occured while probing a file.
Fixes ticket #2722.
Michael Niedermayer [Mon, 1 Jul 2013 00:41:22 +0000 (02:41 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: always send zero packets to flush audio decoders
ffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 00:27:47 +0000 (02:27 +0200)]
Revert "avutil/x86: disable ff_evaluate_lls_sse2() for 32bit"
This reverts commit
247425241cb3b2b76df1c2aced5ce0d56126b82d .
Michael Niedermayer [Mon, 1 Jul 2013 00:26:15 +0000 (02:26 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: lpc: fix a segfault in av_evaluate_lls_sse2()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 00:09:29 +0000 (02:09 +0200)]
vorbisdec: Check VLC tables during use instead of setup
Fixes regression and Ticket2720
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 00:07:26 +0000 (02:07 +0200)]
vorbisdec: propagate errors from setup_classifs()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Loren Merritt [Sun, 30 Jun 2013 22:56:58 +0000 (22:56 +0000)]
x86: lpc: fix a segfault in av_evaluate_lls_sse2()
Marton Balint [Sat, 29 Jun 2013 12:44:30 +0000 (14:44 +0200)]
ffplay: always send zero packets to flush audio decoders
Zero packets are needed not for codecs with CODEC_CAP_DELAY but for
multithreaded decoders as well.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 29 Jun 2013 10:44:47 +0000 (12:44 +0200)]
ffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculation
Fixes ticket #2717.
Signed-off-by: Marton Balint <cus@passwd.hu>
Carl Eugen Hoyos [Sun, 30 Jun 2013 21:45:37 +0000 (23:45 +0200)]
Avoid a null pointer dereference after oom on frame size change in mpegvideo.c.
Fixes ticket #2735.
Carl Eugen Hoyos [Sun, 30 Jun 2013 21:25:18 +0000 (23:25 +0200)]
Avoid a null pointer dereference on oom in the aac encoder.
Fixes ticket #2732.
Paul B Mahol [Sun, 30 Jun 2013 16:58:13 +0000 (16:58 +0000)]
indeo3: check return values of av_malloc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 30 Jun 2013 19:18:12 +0000 (21:18 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Support compilation on aix with gcc.
Rename "AVClass class" as "AVClass component_class".
Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
Rename thread_init() in libavcodec and libavfilter as library_thread_init().
Rename constant HZ in af_biquads.c as HERTZ.
Drop local lable from ppc asm timer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 16:58:06 +0000 (18:58 +0200)]
avutil/x86: disable ff_evaluate_lls_sse2() for 32bit
It just segfaults on 32bit, thus its disabled until someone fixes it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 30 Jun 2013 16:49:45 +0000 (16:49 +0000)]
flac_parser: check return value of av_fifo_alloc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Matthieu Bouron [Sun, 30 Jun 2013 14:15:44 +0000 (16:15 +0200)]
lavf/movenc: use ffio_fill()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 13:46:04 +0000 (15:46 +0200)]
mpegts: use seek_back() for all seek backs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 13:45:23 +0000 (15:45 +0200)]
mpegts: factor seek_back() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 13:42:12 +0000 (15:42 +0200)]
mpegts_read_header: goto fail instead of return directly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 12:04:22 +0000 (14:04 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mjpeg: Check the unescaped size for overflows
Conflicts:
libavcodec/mjpegdec.c
See:
a9456c7c5ca883b5a3947e59a9fba5587e18e119
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 11:50:55 +0000 (13:50 +0200)]
Merge commit '
7520d9779c6d30b385df5a0a42da508238076192 '
* commit '
7520d9779c6d30b385df5a0a42da508238076192 ':
mjpeg: Move code out of else branch
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:47:10 +0000 (13:47 +0200)]
Support compilation on aix with gcc.
Shared libraries and the IBM compiler are currently not supported.
"--arch=ppc" has to be passed to configure, uname is not compatible.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:46:27 +0000 (13:46 +0200)]
Rename "AVClass class" as "AVClass component_class".
The aix header math.h defines "extern int class()" for C.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:45:10 +0000 (13:45 +0200)]
Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
The aix header sys/mstsave.h defines FRAMESIZE as _FRAMESIZE.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:34:46 +0000 (13:34 +0200)]
Rename thread_init() in libavcodec and libavfilter as library_thread_init().
The aix header sys/thread.h contains a definition for thread_init().
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:32:59 +0000 (13:32 +0200)]
Rename constant HZ in af_biquads.c as HERTZ.
The aix header sys/m_param.h defines HZ as _HZ.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:31:25 +0000 (13:31 +0200)]
Drop local lable from ppc asm timer.
The aix assembler does not support local lables.
Michael Niedermayer [Sun, 30 Jun 2013 11:42:41 +0000 (13:42 +0200)]
Merge commit '
7798a59dc14ae27efe64e639a42646002608a908 '
* commit '
7798a59dc14ae27efe64e639a42646002608a908 ':
avconv: Don't include colorspace.h
No change as the commit is already part of ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 11:22:24 +0000 (13:22 +0200)]
Merge commit '
02ec656af72030eea4f3d63e30b25625cce6a3df '
* commit '
02ec656af72030eea4f3d63e30b25625cce6a3df ':
wmapro: error out on impossible scale factor offsets
The check is replaced by an assert(), as the condition cannot be
true except through bugs elsewhere (which should have been fixed
already)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 11:10:33 +0000 (13:10 +0200)]
Merge commit '
d4a217a408da4bd63acc02cd8f9ebe378a2ad65a '
* commit '
d4a217a408da4bd63acc02cd8f9ebe378a2ad65a ':
wmapro: check the min_samples_per_subframe
Conflicts:
libavcodec/wmaprodec.c
See:
9166f483c52e7e0a031a7bb149bea16aaa72f344
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 10:59:11 +0000 (12:59 +0200)]
Merge commit '
183880cfc4aae53ce504e13337791cad5841c80c '
* commit '
183880cfc4aae53ce504e13337791cad5841c80c ':
pictor: use the correct logging context
No change, as this has already been fixed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 10:34:50 +0000 (12:34 +0200)]
avcodec/lpc: Use a function pointer from an initialized context
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 10:20:12 +0000 (12:20 +0200)]
Merge commit '
c93ccf5a4cca722b39f05e9f5660b4cb75bc1740 '
* commit '
c93ccf5a4cca722b39f05e9f5660b4cb75bc1740 ':
lpc: use levinson for the first pass of multipass cholesky
Conflicts:
libavcodec/lpc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 10:15:12 +0000 (12:15 +0200)]
Merge commit '
b545179fdff1ccfbbb9d422e4e9720cb6c6d9191 '
* commit '
b545179fdff1ccfbbb9d422e4e9720cb6c6d9191 ':
x86: lpc: simd av_evaluate_lls
Conflicts:
libavutil/x86/lls.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 09:59:31 +0000 (11:59 +0200)]
lls.asm: disable ff_update_lls_avx
The code doesnt build with yasm from ubuntu 12.04
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 09:41:45 +0000 (11:41 +0200)]
lls.asm: put avx code under if HAVE_AVX_EXTERNAL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 09:30:07 +0000 (11:30 +0200)]
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>
Michael Niedermayer [Sun, 30 Jun 2013 09:22:15 +0000 (11:22 +0200)]
Merge commit '
41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2 '
* commit '
41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2 ':
lpc: use function pointers, in preparation for asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 08:54:12 +0000 (10:54 +0200)]
Merge commit '
cc6714bb16b1f0716ba43701d47273dbe9657b8b '
* commit '
cc6714bb16b1f0716ba43701d47273dbe9657b8b ':
lpc: remove "decay" argument
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 29 Jun 2013 04:07:57 +0000 (06:07 +0200)]
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
Luca Barbato [Sat, 29 Jun 2013 04:13:53 +0000 (06:13 +0200)]
mjpeg: Move code out of else branch
Simplify the control flow and spare some vertical space.
Michael Niedermayer [Sat, 29 Jun 2013 22:31:51 +0000 (00:31 +0200)]
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>
Michael Niedermayer [Sat, 29 Jun 2013 23:29:49 +0000 (01:29 +0200)]
4xm: Dont ignore dc run errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 23:28:25 +0000 (01:28 +0200)]
4xm: check for invalid zero ac coeffs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 23:01:24 +0000 (01:01 +0200)]
mjpeg_decode_dc: check code before using it in get_xbits()
Fixes undefined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Sat, 29 Jun 2013 18:20:20 +0000 (14:20 -0400)]
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>
Michael Niedermayer [Sat, 29 Jun 2013 20:20:20 +0000 (22:20 +0200)]
get_pix_fmt_score: favor equal formats if all else equal
Fixes Ticket2578
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Sat, 29 Jun 2013 18:20:20 +0000 (14:20 -0400)]
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>
Michael Niedermayer [Sat, 29 Jun 2013 17:27:49 +0000 (19:27 +0200)]
update all trac links to use the trac subdomain
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 16:27:52 +0000 (18:27 +0200)]
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>
Luca Barbato [Sat, 29 Jun 2013 00:16:50 +0000 (02:16 +0200)]
wmapro: error out on impossible scale factor offsets
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 28 Jun 2013 23:56:09 +0000 (01:56 +0200)]
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
Luca Barbato [Sat, 29 Jun 2013 03:41:58 +0000 (05:41 +0200)]
pictor: use the correct logging context
Broken in
6d97484d72e33f7dde9493a9ead1a72e2f029605
Reuben Martin [Sat, 29 Jun 2013 02:11:53 +0000 (21:11 -0500)]
Added codec ID to playback DNxHD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 29 Jun 2013 15:50:07 +0000 (17:50 +0200)]
Avoid a null pointer dereference on clean-up after oom in ac3 encoder.
Carl Eugen Hoyos [Sat, 29 Jun 2013 14:04:07 +0000 (16:04 +0200)]
Avoid a null pointer dereference on oom when decoding smacker.
Fixes ticket #2728.
Carl Eugen Hoyos [Sat, 29 Jun 2013 14:02:43 +0000 (16:02 +0200)]
Propagate error return values from the smacker decoder.
Carl Eugen Hoyos [Sat, 29 Jun 2013 12:49:47 +0000 (14:49 +0200)]
Avoid a null pointer dereference on oom when decoding vc1.
Fixes ticket #2723.
Stefano Sabatini [Sat, 29 Jun 2013 12:09:47 +0000 (14:09 +0200)]
doc/muxers: apply various minor fixes to segment documentation
Stefano Sabatini [Sat, 29 Jun 2013 11:53:58 +0000 (13:53 +0200)]
doc/muxers: sort muxers by name
Loren Merritt [Sun, 16 Jun 2013 00:53:47 +0000 (00:53 +0000)]
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>
Loren Merritt [Tue, 18 Jun 2013 21:30:43 +0000 (21:30 +0000)]
x86: lpc: simd av_evaluate_lls
1.5x-1.8x faster on sandybridge
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Loren Merritt [Tue, 18 Jun 2013 21:30:42 +0000 (21:30 +0000)]
x86: lpc: simd av_update_lls
4x-6x faster on sandybridge
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Loren Merritt [Tue, 18 Jun 2013 21:30:41 +0000 (21:30 +0000)]
lpc: use function pointers, in preparation for asm
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Loren Merritt [Tue, 18 Jun 2013 21:30:40 +0000 (21:30 +0000)]
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>
Michael Niedermayer [Sat, 29 Jun 2013 10:03:59 +0000 (12:03 +0200)]
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:
b21ba20cc83c80fe56192fee3626a8087f37d806
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 09:37:38 +0000 (11:37 +0200)]
Merge commit '
6652338f43ef623045912d7f28b61adea05d27ae '
* commit '
6652338f43ef623045912d7f28b61adea05d27ae ':
wmapro: return early on unsupported condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 09:19:37 +0000 (11:19 +0200)]
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:
780d45473c32fa356c8ce385c3ea4692567c3228
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 08:58:52 +0000 (10:58 +0200)]
Merge commit '
afe03092dd693d025d43e1620283d8d285c92772 '
* commit '
afe03092dd693d025d43e1620283d8d285c92772 ':
lavc: move put_bits_left in put_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 01:44:15 +0000 (03:44 +0200)]
avformat: make av_register_*put_format() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 01:39:03 +0000 (03:39 +0200)]
avcodec/bitstream_filter: make av_register_bitstream_filter() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 01:24:32 +0000 (03:24 +0200)]
avcodec/parser: Make av_register_codec_parser() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 01:11:48 +0000 (03:11 +0200)]
avcodec: Make av_register_hwaccel() and avcodec_register() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 29 Jun 2013 00:24:26 +0000 (17:24 -0700)]
cosmetics: Fix "dont" "wont" "doesnt" typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Chinen [Fri, 28 Jun 2013 05:16:39 +0000 (14:16 +0900)]
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>
Michael Niedermayer [Fri, 28 Jun 2013 21:58:13 +0000 (23:58 +0200)]
udp: Fix receiving large udp packets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 28 Jun 2013 21:21:57 +0000 (21:21 +0000)]
tak_parser: properly mark packets as key frames
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Fri, 28 Jun 2013 14:23:39 +0000 (16:23 +0200)]
Do not list libshine like a main option in configure's output.
It is listed as an enabled external library if applicable.
Luca Barbato [Fri, 28 Jun 2013 03:23:21 +0000 (05:23 +0200)]
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
Luca Barbato [Fri, 28 Jun 2013 03:21:33 +0000 (05:21 +0200)]
wmapro: return early on unsupported condition
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 28 Jun 2013 02:03:47 +0000 (04:03 +0200)]
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
Luca Barbato [Fri, 28 Jun 2013 01:40:35 +0000 (03:40 +0200)]
lavc: move put_bits_left in put_bits.h
Timothy Gu [Fri, 28 Jun 2013 02:07:32 +0000 (19:07 -0700)]
doc/decoders: document libopus decoder
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Timothy Gu [Fri, 28 Jun 2013 01:50:54 +0000 (18:50 -0700)]
doc/encoders: alphabetically list the encoders
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Fri, 28 Jun 2013 10:39:26 +0000 (12:39 +0200)]
avfilter/avfilter: Make avfilter_register() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Jun 2013 08:14:12 +0000 (10:14 +0200)]
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>
Michael Niedermayer [Fri, 28 Jun 2013 08:08:43 +0000 (10:08 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aac: return meaningful errors
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Jun 2013 08:00:51 +0000 (10:00 +0200)]
Merge commit '
6d8629aac13692447b54eac795bf74007ebf8987 '
* commit '
6d8629aac13692447b54eac795bf74007ebf8987 ':
aac: K&R formatting cosmetics
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 27 Jun 2013 12:03:16 +0000 (14:03 +0200)]
Avoid a null pointer dereference in avcodec_decode_video2().
This could happen if oom occured while probing a file.
Reported in ticket #1900.
Carl Eugen Hoyos [Thu, 27 Jun 2013 11:58:30 +0000 (13:58 +0200)]
Set block_align when reading QDM2 in mov.
Fixes ticket #2718.