]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 22 Jan 2013 02:13:51 +0000 (03:13 +0100)]
avcodec/x86/cabac: workaround llvm 4.2.1 bug
x86_64 is affected by this too
Fixes Ticket2156
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 15:47:34 +0000 (16:47 +0100)]
doc: document aresample:first_pts
Documentation copied from asyncts, the options are supposed to do
the same thing. If not please submit a testcase where they differ
so we can fix it.
Disscussed-with: saste on IRC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 22:00:20 +0000 (23:00 +0100)]
avf_showwaves: fix null pointer dereference
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 21:45:58 +0000 (22:45 +0100)]
doc/swr: More verbose description of the force resample flag.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 20:48:34 +0000 (21:48 +0100)]
doc/swr: elaborate on what the LFE mix level is.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 20:46:48 +0000 (21:46 +0100)]
doc/swr: typo fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 20:44:39 +0000 (21:44 +0100)]
doc/swr: docu lfe mix level unit & range
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 20:41:07 +0000 (21:41 +0100)]
doc/swr: try to fix non english "inclusively included between"
Googling this term has 9 hits, 7 from ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 20:16:43 +0000 (21:16 +0100)]
doc/swr: Mention that the internal sample format is choosen automatically if not set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 20:14:27 +0000 (21:14 +0100)]
docs/swr: better used_channel_count docs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jan 2013 21:02:08 +0000 (22:02 +0100)]
img2dec: support seeking in infinitely looped stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 18 Jan 2013 23:50:40 +0000 (00:50 +0100)]
doc/muxers: extend and clarify documentation for the segment muxer time options
Stefano Sabatini [Sun, 13 Jan 2013 16:22:59 +0000 (17:22 +0100)]
lavf/hlsenc: append last incomplete segment when closing the output
Also introduce missing check on PTS value in case of NOPTS value.
Michael Niedermayer [Mon, 21 Jan 2013 18:09:16 +0000 (19:09 +0100)]
dsputil: CONFIG_DWT doesnt exist anymore
place snow dwt init under correct checks
should fix compilation with enable-random
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 18:04:34 +0000 (19:04 +0100)]
vp3: fix compilation with a disabled theora
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 15:41:50 +0000 (16:41 +0100)]
oggdec: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 15:34:24 +0000 (16:34 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputilenc: x86: Convert pixel inline asm to yasm
libgsm: detect libgsm header path
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 15:28:04 +0000 (16:28 +0100)]
Merge commit '
ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3 '
* commit '
ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3 ':
fate: Use wmv2 IDCT for wmv2 tests
vorbisdsp: change block_size type from int to intptr_t.
Conflicts:
tests/fate-run.sh
tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 17 Jan 2013 21:53:27 +0000 (21:53 +0000)]
afade filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 21 Jan 2013 15:14:41 +0000 (16:14 +0100)]
Merge commit '
93af2734ee609133eaeca28329d7f13241dd411f '
* commit '
93af2734ee609133eaeca28329d7f13241dd411f ':
lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 14:34:57 +0000 (15:34 +0100)]
Merge commit '
e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0 '
* commit '
e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0 ':
wmv2: move IDCT to its own DSP context.
Conflicts:
libavcodec/dsputil.h
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth1-wmv2
tests/ref/vsynth/vsynth2-wmv2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 14:18:57 +0000 (15:18 +0100)]
Merge commit '
8a4f26206d7914eaf2903954ce97cb7686933382 '
* commit '
8a4f26206d7914eaf2903954ce97cb7686933382 ':
dsputil: remove butterflies_float_interleave.
srtp: Move a variable to a local scope
srtp: Add tests for the crypto suite with 32/80 bit HMAC
Conflicts:
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 14:07:04 +0000 (15:07 +0100)]
Merge commit '
3ef6d22e1ba544ab37c73e8fc61382f13aac250f '
* commit '
3ef6d22e1ba544ab37c73e8fc61382f13aac250f ':
srtp: cosmetics: Use fewer lines for the test vectors
srtp: Don't require more input data than what actually is needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 14:00:45 +0000 (15:00 +0100)]
Merge commit '
a2a991b2ddf951454ffceb7bcedc9db93e26c610 '
* commit '
a2a991b2ddf951454ffceb7bcedc9db93e26c610 ':
srtp: Improve the minimum encryption buffer size check
srtp: Add support for a few DTLS-SRTP related crypto suites
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 13:55:48 +0000 (14:55 +0100)]
Merge commit '
f53490cc0c809975f8238d5a9edbd26f83bd2f84 '
* commit '
f53490cc0c809975f8238d5a9edbd26f83bd2f84 ':
rtpdec/srtp: Handle CSRC fields being present
rtpdec: Check the return value from av_new_packet
ac3dec: fix non-optimal dithering of zero bit mantissas
Conflicts:
libavcodec/ac3dec.c
libavformat/rtpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 13:16:34 +0000 (14:16 +0100)]
ac3dec: fix non-optimal dithering of zero bit mantissas
Use a noise range of -0.707 to 0.707 instead of -0.5 to 0.5
Based on patch by: Mathias Rauen <madshi@gmail.com> and commit by Justin Ruggles (
04ea5491 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 13:10:26 +0000 (14:10 +0100)]
Merge commit '
d9bf716945046333c24580d538f450b516f15710 '
* commit '
d9bf716945046333c24580d538f450b516f15710 ':
ppc: vorbisdsp: Drop some unnecessary #includes
avconv: Increase the SDP buffer size to fit xiph SDPs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 13:00:03 +0000 (14:00 +0100)]
Merge commit '
c6f1dc8e4cd967ae056698eafb891a08003c211c '
* commit '
c6f1dc8e4cd967ae056698eafb891a08003c211c ':
rtpdec: Move setting the parsing flags to the actual depacketizers
rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer
Conflicts:
libavformat/rtpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 12:52:06 +0000 (13:52 +0100)]
Merge commit '
2326558d5277ec87ba6d607a01ec6acfc51c694c '
* commit '
2326558d5277ec87ba6d607a01ec6acfc51c694c ':
rtpdec: Split mpegts parsing to a normal depacketizer
rtpdec: Reorder payload handler registration alphabetically
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 12:45:32 +0000 (13:45 +0100)]
Merge commit '
a717f9904227d7979473bad40c50eb40af41d01d '
* commit '
a717f9904227d7979473bad40c50eb40af41d01d ':
mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions
rtpdec_mpeg4: Return one AAC AU per AVPacket
ppc: Include string.h for memset
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Jan 2013 12:38:57 +0000 (13:38 +0100)]
Merge commit '
68f18f03519ae550e25cf12661172641e9f0eaca '
* commit '
68f18f03519ae550e25cf12661172641e9f0eaca ':
videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
dsputil: drop non-compliant "fast" qpel mc functions
get_bits: change the failure condition in init_get_bits
Conflicts:
libavcodec/get_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 9 Jan 2013 10:56:18 +0000 (10:56 +0000)]
EVRC decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Daniel Kang [Wed, 16 Jan 2013 07:41:39 +0000 (02:41 -0500)]
dsputilenc: x86: Convert pixel inline asm to yasm
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Brad Smith [Mon, 21 Jan 2013 01:33:27 +0000 (20:33 -0500)]
libgsm: detect libgsm header path
Libgsm header can reside either in the base include dir or in
the gsm subdir.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Ronald S. Bultje [Sat, 19 Jan 2013 20:04:06 +0000 (12:04 -0800)]
fate: Use wmv2 IDCT for wmv2 tests
Ronald S. Bultje [Mon, 21 Jan 2013 06:26:42 +0000 (22:26 -0800)]
vorbisdsp: change block_size type from int to intptr_t.
This saves one instruction in the x86-64 assembly.
Ronald S. Bultje [Mon, 21 Jan 2013 06:15:28 +0000 (22:15 -0800)]
lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.
This allows us to get rid of them on the next major bump. All of the
above are functionally irrelevant, and most of them are unused, except
the vp3 one, which is used wrongly in the bfin arch optimizations.
Ronald S. Bultje [Mon, 21 Jan 2013 06:12:35 +0000 (22:12 -0800)]
wmv2: move IDCT to its own DSP context.
This allows us to remove FF_IDCT_WMV2, which serves no practical purpose
other than to be able to select the WMV2 IDCT for MPEG (or vice versa)
and get corrupt output.
Fate tests for all wmv2-related tests change, because (for some obscure
reason) they forced use of the MPEG IDCT. You would get the same changes
previously by not using -idct simple in the fate test (or replacing it
with -idct auto).
Ronald S. Bultje [Mon, 21 Jan 2013 05:57:35 +0000 (21:57 -0800)]
dsputil: remove butterflies_float_interleave.
The function is unused.
Michael Niedermayer [Sun, 20 Jan 2013 16:50:17 +0000 (17:50 +0100)]
oggdec: #if 0 disabled code
Fixes CID968589
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Micah Galizia [Mon, 21 Jan 2013 01:25:30 +0000 (20:25 -0500)]
fix memory leak on string reassign
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes CID968584 and CID968585
Michael Niedermayer [Sun, 20 Jan 2013 23:52:14 +0000 (00:52 +0100)]
swr: support first_pts
Trolled-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Xi Wang [Sun, 20 Jan 2013 20:38:21 +0000 (15:38 -0500)]
lavfi: fix null checking in avfilter_config_links()
Move the first use of `link' after the null pointer check.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 20 Jan 2013 22:26:35 +0000 (23:26 +0100)]
Clarify that the recommended audio squeezing/stretching filter is aresample.
Fixes ticket #2036.
Martin Storsjö [Sun, 20 Jan 2013 17:06:51 +0000 (19:06 +0200)]
srtp: Move a variable to a local scope
This simplifies the code slightly.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 18 Jan 2013 11:46:16 +0000 (13:46 +0200)]
srtp: cosmetics: Use fewer lines for the test vectors
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 18 Jan 2013 10:33:02 +0000 (12:33 +0200)]
srtp: Improve the minimum encryption buffer size check
This clarifies where the limit number comes from, and only
requires exactly as much padding space as will be needed.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 18 Jan 2013 11:44:34 +0000 (13:44 +0200)]
srtp: Add tests for the crypto suite with 32/80 bit HMAC
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 18 Jan 2013 10:35:31 +0000 (12:35 +0200)]
srtp: Don't require more input data than what actually is needed
The theoretical minimum for a (not totally well formed) RTCP packet
is 8 bytes, so we shouldn't require 12 bytes as minimum input.
Also return AVERROR_INVALIDDATA instead of 0 if something that is
not a proper packet is given.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 18 Jan 2013 10:01:33 +0000 (12:01 +0200)]
srtp: Add support for a few DTLS-SRTP related crypto suites
The main difference to the existing suites from RFC 4568 is
that the version with a 32 bit HMAC still uses 80 bit HMAC
for RTCP packets.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 20 Jan 2013 17:00:18 +0000 (19:00 +0200)]
rtpdec/srtp: Handle CSRC fields being present
This is untested in practice, but follows the spec.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 20 Jan 2013 16:31:57 +0000 (18:31 +0200)]
rtpdec: Check the return value from av_new_packet
Signed-off-by: Martin Storsjö <martin@martin.st>
Xi Wang [Sun, 20 Jan 2013 20:26:12 +0000 (15:26 -0500)]
cafdec: fix overflow checking in read_header()
Several compilers such as clang/icc/pathscale will optimize the check
pos + size < pos (assuming size > 0) into false, since signed integer
overflow is undefined behavior in C. This breaks overflow checking.
Use a safe precondition check instead.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 19:59:30 +0000 (20:59 +0100)]
wtvdec: fix integer overflow
Fixes CID968583
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mathias Rauen [Sat, 5 Jan 2013 16:30:31 +0000 (11:30 -0500)]
ac3dec: fix non-optimal dithering of zero bit mantissas
Use a noise range of -0.707 to 0.707 instead of -0.5 to 0.5
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Sun, 20 Jan 2013 19:02:35 +0000 (20:02 +0100)]
h264/ff_generate_sliding_window_mmcos: fix use of uninitialized variable
Fixes CID968587
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 19:01:39 +0000 (20:01 +0100)]
h264: print mismatching opcode details in check_opcodes()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 18:50:33 +0000 (19:50 +0100)]
h264: fix use of uninitialized variable
Fixed CID968588
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jan 2013 19:02:37 +0000 (20:02 +0100)]
theora: support midstream reconfiguration
Fixes Ticket868
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jan 2013 18:58:59 +0000 (19:58 +0100)]
oggdec: Support chained streams, support replacing streams in multistream files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Conflicts:
Changelog
Diego Biurrun [Sun, 20 Jan 2013 15:50:04 +0000 (16:50 +0100)]
ppc: vorbisdsp: Drop some unnecessary #includes
Also fixes compilation with AltiVec disabled.
Martin Storsjö [Thu, 17 Jan 2013 13:34:25 +0000 (15:34 +0200)]
avconv: Increase the SDP buffer size to fit xiph SDPs
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 17 Jan 2013 13:29:12 +0000 (15:29 +0200)]
rtpdec: Move setting the parsing flags to the actual depacketizers
This gets rid of almost all the codec specific details from the
generic rtpdec code.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 17 Jan 2013 13:08:03 +0000 (15:08 +0200)]
rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer
This also adds checking of mallocs.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 17 Jan 2013 12:34:59 +0000 (14:34 +0200)]
rtpdec: Split mpegts parsing to a normal depacketizer
This gets rid of a number of special cases from the common rtpdec
code.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 17 Jan 2013 12:27:14 +0000 (14:27 +0200)]
rtpdec: Reorder payload handler registration alphabetically
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 20 Jan 2013 16:14:25 +0000 (17:14 +0100)]
vc1dec: add assert to impossible *_valid combination.
This also fixes a warning about uninitialized variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 19 Jan 2013 23:59:08 +0000 (01:59 +0200)]
mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions
The lavf-internal parser functions are used when receiving
mpegts over RTP. This fixes memory leaks in this setup.
The normal mpegts demuxer close function was updated in
ec7d0d2e in
2004 to fix leaks, but the parsing function used for RTP wasn't
updated and has been leaking ever since.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 15 Jan 2013 14:58:48 +0000 (16:58 +0200)]
rtpdec_mpeg4: Return one AAC AU per AVPacket
This makes the returned data valid to stream copy into other
containers as well, not only for decoding straight away.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 20 Jan 2013 14:30:09 +0000 (16:30 +0200)]
ppc: Include string.h for memset
This fixes build failures on ppc machines with a compiler that
supports -Werror=implicit-function-declaration.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 20 Jan 2013 16:09:48 +0000 (17:09 +0100)]
swr: fix "may be used uninitialized in this function" warnings
The uninitialized use implicates 0 channels, which is unlikely
to reach this function but fixed anyway in this commit.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sun, 20 Jan 2013 13:48:35 +0000 (14:48 +0100)]
videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
libavutil/arm/asm.S sets '.arch' depending on HAVE_ARMV5TE so that
assembling armv5te code will always succeed even if the default -march
flag does not support it. HAVE_ARMV5TE_EXTERNAL tests assembling code
with the default arch.
Fixes the missing symbol ff_prefetch_arm with --cpu= not including
armv5te.
CC: libav-stable@libav.org
Michael Niedermayer [Sun, 20 Jan 2013 14:03:13 +0000 (15:03 +0100)]
h264: Only apply error concealment if theres a frame
Without any correctly decoded slices, there can be no frame.
Fixes out of array reads
Found-by: Rafaël Carré
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Fri, 18 Jan 2013 22:37:41 +0000 (23:37 +0100)]
dsputil: drop non-compliant "fast" qpel mc functions
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Sun, 20 Jan 2013 13:20:06 +0000 (14:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 13:07:51 +0000 (14:07 +0100)]
Merge commit '
fef906c77c09940a2fdad155b2adc05080e17eda '
* commit '
fef906c77c09940a2fdad155b2adc05080e17eda ':
Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 12:57:10 +0000 (13:57 +0100)]
Merge commit '
aeaf268e52fc11c1f64914a319e0edddf1346d6a '
* commit '
aeaf268e52fc11c1f64914a319e0edddf1346d6a ':
vp3: integrate clear_blocks with idct of previous block.
mpegvideo: fix loop condition in draw_line()
dvdsubdec: parse the size from the extradata
Conflicts:
libavcodec/dvdsubdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 20 Jan 2013 04:10:32 +0000 (05:10 +0100)]
get_bits: change the failure condition in init_get_bits
Too much code relies in having init_get_bits fed with a valid
buffer and set its dimension to 0.
Check for NULL buffer instead.
Ronald S. Bultje [Fri, 18 Jan 2013 06:02:58 +0000 (22:02 -0800)]
Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.
The function is never used.
Ronald S. Bultje [Sun, 20 Jan 2013 06:21:10 +0000 (22:21 -0800)]
Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
Conveniently (together with Justin's earlier patches), this makes
our vorbis decoder entirely independent of dsputil.
Ronald S. Bultje [Fri, 18 Jan 2013 15:43:04 +0000 (16:43 +0100)]
vp3: integrate clear_blocks with idct of previous block.
This is identical to what e.g. vp8 does, and prevents the function call
overhead (plus dependency on dsputil for this particular function).
Arm asm updated by Janne Grunau <janne-libav@jannau.net>.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Matthieu Bouron [Sat, 19 Jan 2013 12:32:58 +0000 (13:32 +0100)]
lavf/id3v2: seek back to previous offset if header size is not matched
Makes ff_id3v2_read reset stream position at the end of ID3 data if the
header size is not matched (caused by an EOF for example).
Current behaviour (without the patch):
filesize = 400
id3 data size = 399
file offset after ff_id3v2_read is 400 instead of 399
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 03:14:09 +0000 (04:14 +0100)]
mpeg1enc: Disable threads for resolutions too large for multi-threading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 21:46:34 +0000 (22:46 +0100)]
sws: check that dither array is not null before memset
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 20:43:54 +0000 (21:43 +0100)]
sws: Check for unsupported combination of ED/FULL_CHR flags
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 22:11:26 +0000 (23:11 +0100)]
sws: Fix error diffusion flag
The used flag was mistakenly overlapping with chroma drop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Xi Wang [Sat, 19 Jan 2013 18:21:35 +0000 (13:21 -0500)]
mpegvideo: fix loop condition in draw_line()
The loop condition `x = ex' is incorrect. It should be `x <= ex'.
This bug was introduced in commit
c65dfac4 "mpegvideo.c: K&R formatting
and cosmetics."
CC:libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Nicolas George [Wed, 2 Jan 2013 18:08:08 +0000 (19:08 +0100)]
ffmpeg: accept "chapters" as forced key frames.
Allow to force a key frame at the beginning of each chapter.
Clément Bœsch [Wed, 16 Jan 2013 17:42:16 +0000 (18:42 +0100)]
dvdsubdec: parse the size from the extradata
Signed-off-by: Alexandra Khirnova <alexandra.khirnova@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Thu, 17 Jan 2013 16:03:07 +0000 (17:03 +0100)]
cmdline: fix -- to escape files starting with -
Fixes Ticket2127
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Sat, 19 Jan 2013 12:38:26 +0000 (13:38 +0100)]
lavf/id3v2: cosmetics: reindent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 19 Jan 2013 04:02:19 +0000 (01:02 -0300)]
configure: Fix Barcelona and Bulldozer compiler options with suncc
Barcelona/amdfam10 does not support SSE4 instructions.
Also, Bulldozer supports AVX instructions, so use them instead.
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 19 Jan 2013 03:48:59 +0000 (00:48 -0300)]
doc/Makefile: Fix make docclean
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 12:18:10 +0000 (13:18 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Drop some unused macro definitions
x86: Add a Yasm-based emms() replacement
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 12:11:34 +0000 (13:11 +0100)]
Merge commit '
d633d12b2cc999cee3ac25bf9a810fe7ff03726d '
* commit '
d633d12b2cc999cee3ac25bf9a810fe7ff03726d ':
x86inc: Add cvisible macro for C functions with public prefix
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 12:01:06 +0000 (13:01 +0100)]
Merge commit '
ef5d41a5534b65f03d02f2e11a503ab8416bfc3b '
* commit '
ef5d41a5534b65f03d02f2e11a503ab8416bfc3b ':
x86inc: Rename "program_name" to "private_prefix"
configure: Run SHFLAGS through ldflags_filter()
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 19 Jan 2013 09:45:34 +0000 (10:45 +0100)]
APIchanges: Add git version and fix version for avfilter_ref_get_channels().
Carl Eugen Hoyos [Sat, 19 Jan 2013 09:42:27 +0000 (10:42 +0100)]
Add APIchanges entry for av_codec_get_tag2().
Michael Niedermayer [Sat, 19 Jan 2013 05:18:24 +0000 (06:18 +0100)]
h264: unmark frames at the end
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 03:21:44 +0000 (04:21 +0100)]
sws: fix ED mono dither black level
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>