OSDN Git Service
Michael Niedermayer [Sat, 14 Apr 2012 19:49:01 +0000 (21:49 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vsrc_buffer: fix check from
7ae7c41.
libxvid: Reorder functions to avoid forward declarations; make functions static.
libxvid: drop some pointless dead code
wmal: vertical alignment cosmetics
wmal: Warn about missing bitstream splicing feature and ask for sample.
wmal: Skip seekable_frame_in_packet.
wmal: Drop unused variable num_possible_block_size.
avfiltergraph: make the AVFilterInOut alloc/free API public
graphparser: allow specifying sws flags in the graph description.
graphparser: fix the order of connecting unlabeled links.
graphparser: add avfilter_graph_parse2().
vsrc_buffer: allow using a NULL buffer to signal EOF.
swscale: handle last pixel if lines have an odd width.
qdm2: fix a dubious pointer cast
WMAL: Do not try to read rawpcm coefficients if bits is invalid
mov: Fix detecting there is no sync sample.
tiffdec: K&R cosmetics
avf: has_duration does not check the global one
dsputil: fix optimized emu_edge function on Win64.
Conflicts:
doc/APIchanges
libavcodec/libxvid_rc.c
libavcodec/libxvidff.c
libavcodec/tiff.c
libavcodec/wmalosslessdec.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
libavfilter/vsrc_buffer.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Apr 2012 18:04:05 +0000 (20:04 +0200)]
indeo4: setup width/height properly.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Apr 2012 17:33:24 +0000 (19:33 +0200)]
matroskadec: fix null pointer dereference
Fixes: Ticket1206
Found-by: John Villamil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 14 Apr 2012 10:49:27 +0000 (12:49 +0200)]
vsrc_buffer: fix check from
7ae7c41.
The user submitted variable in this function is frame, not buf.
Michael Niedermayer [Sat, 14 Apr 2012 16:32:36 +0000 (18:32 +0200)]
wtvdec: fix name_size check to consider integer overflows.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Apr 2012 16:28:31 +0000 (18:28 +0200)]
lagarith: check count before writing zeros.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jakub Stachowski [Sat, 14 Apr 2012 13:44:39 +0000 (15:44 +0200)]
Clear residues only in not coded channel. This fixes overwriting coded residues with zeros if first channel is coded and second is not.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Wed, 11 Apr 2012 22:23:28 +0000 (00:23 +0200)]
latmenc: replace per-frame malloc/free by constant size buffer.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Fri, 13 Apr 2012 21:34:43 +0000 (23:34 +0200)]
avidec: handle 0-size packets that exist only in index.
0-sized packets are used to implement variable fps.
However there seems to be a variation where these are not
even stored in the main file but as 0-size index entries
only.
This fixes the sample in trac issue #957, it now plays both
the same ways as in MPlayer and in a way that looks correct.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Fri, 13 Apr 2012 22:47:53 +0000 (00:47 +0200)]
mp3enc: clarify meaning of "Unsupported" messages.
They will only cause us to skip writing the Xing header,
not cause any serious breakage.
Related to trac issue #1027.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun [Thu, 12 Apr 2012 11:43:09 +0000 (13:43 +0200)]
libxvid: Reorder functions to avoid forward declarations; make functions static.
Diego Biurrun [Thu, 12 Apr 2012 11:42:09 +0000 (13:42 +0200)]
libxvid: drop some pointless dead code
Michael Niedermayer [Sat, 14 Apr 2012 14:32:56 +0000 (16:32 +0200)]
wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mashiat Sarker Shakkhar [Fri, 13 Apr 2012 21:00:22 +0000 (14:00 -0700)]
wmal: vertical alignment cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Mashiat Sarker Shakkhar [Fri, 13 Apr 2012 21:00:21 +0000 (14:00 -0700)]
wmal: Warn about missing bitstream splicing feature and ask for sample.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Mashiat Sarker Shakkhar [Fri, 13 Apr 2012 21:00:20 +0000 (14:00 -0700)]
wmal: Skip seekable_frame_in_packet.
There is no point in storing the value in a variable, since it is not
used anywhere else in the decoder.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Mashiat Sarker Shakkhar [Fri, 13 Apr 2012 21:00:19 +0000 (14:00 -0700)]
wmal: Drop unused variable num_possible_block_size.
This is probably a leftover from WMA Pro.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Sat, 14 Apr 2012 12:51:24 +0000 (14:51 +0200)]
wmalosslessdec: Fix reading too many bits in decode_channel_residues()
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Apr 2012 12:50:25 +0000 (14:50 +0200)]
wmalosslessdec: fix a get_bits(0) in decode_ac_filter
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Apr 2012 12:49:22 +0000 (14:49 +0200)]
wmalosslessdec: make mclms arrays big enough for whats written into them.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Apr 2012 11:34:14 +0000 (13:34 +0200)]
wmalosslessdec: Make arrays WMALL_BLOCK_MAX_SIZE big and check samples_per_frame.
The samples_per_frame check is ported from wmaprodec.c
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Apr 2012 11:13:32 +0000 (13:13 +0200)]
wmaprodec: check min_samples_per_subframe
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Apr 2012 10:03:04 +0000 (12:03 +0200)]
wmaprodec; fix get_bits(0) case.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Apr 2012 09:07:11 +0000 (11:07 +0200)]
wmaprodec: check num_vec_coeffs for validity
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Apr 2012 08:43:35 +0000 (10:43 +0200)]
lavf: print with debug level the byte positions before and after find_stream_info
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 11 Jun 2011 13:30:46 +0000 (15:30 +0200)]
avfiltergraph: make the AVFilterInOut alloc/free API public
This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Mon, 9 Apr 2012 04:13:53 +0000 (06:13 +0200)]
graphparser: allow specifying sws flags in the graph description.
Anton Khirnov [Mon, 9 Apr 2012 03:01:05 +0000 (05:01 +0200)]
graphparser: fix the order of connecting unlabeled links.
Right now, e.g. scale,[in]overlay would connect scale to the first
overlay input and [in] to the second, which goes against the
documentation and is unintuitive.
The bug happens because of the ordering mess in curr_inputs variable:
1) the unlabeled links from the previous filter are added to it in
correct order
2) input labels are parsed and inserted to the beginning one by one
(i.e. in reverse order)
3) curr_inputs is matched against filter inputs in reverse order
Fix the problem by always using proper ordering without trying to be
clever.
Anton Khirnov [Wed, 21 Mar 2012 06:46:56 +0000 (07:46 +0100)]
graphparser: add avfilter_graph_parse2().
Unlike avfilter_graph_parse(), it returns unlinked inputs and outputs
to the caller, which allows parsing of graphs where inputs/outputs are
not known in advance.
Anton Khirnov [Sun, 1 Apr 2012 16:53:58 +0000 (18:53 +0200)]
vsrc_buffer: allow using a NULL buffer to signal EOF.
Michael Niedermayer [Fri, 13 Apr 2012 22:07:38 +0000 (00:07 +0200)]
mp3on4: allocate a large enough frame.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Apr 2012 21:56:26 +0000 (23:56 +0200)]
avidec: update size when packet is shrunk
Fixes out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Fri, 6 Apr 2012 00:30:19 +0000 (17:30 -0700)]
swscale: handle last pixel if lines have an odd width.
Fixes bug 270.
Clément Bœsch [Fri, 13 Apr 2012 21:11:39 +0000 (23:11 +0200)]
lavfi/drawbox: fix width displayed in place of x.
Michael Niedermayer [Fri, 13 Apr 2012 20:57:23 +0000 (22:57 +0200)]
dfa: Fix out of array write in decode_dds1()
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Apr 2012 20:52:16 +0000 (22:52 +0200)]
dfa: fix out of array write in decode_wdlt()
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Fri, 13 Apr 2012 16:43:54 +0000 (17:43 +0100)]
qdm2: fix a dubious pointer cast
This reworks a loop to get rid of an ugly pointer cast,
fixing errors seen with the PathScale ENZO compiler.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Fri, 13 Apr 2012 14:40:53 +0000 (07:40 -0700)]
WMAL: Do not try to read rawpcm coefficients if bits is invalid
Signed-off-by: Martin Storsjö <martin@martin.st>
Yusuke Nakamura [Fri, 13 Apr 2012 09:59:14 +0000 (18:59 +0900)]
mov: Fix detecting there is no sync sample.
Stss atom without entries doesn't mean every sample is a sync sample.
Signed-off-by: Martin Storsjö <martin@martin.st>
Alex Converse [Fri, 13 Apr 2012 01:28:37 +0000 (18:28 -0700)]
tiffdec: K&R cosmetics
Michael Niedermayer [Fri, 13 Apr 2012 19:21:15 +0000 (21:21 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: K&R formatting cosmetics (part II)
tiffdec: Add a malloc check and refactor another.
faxcompr: Check malloc results and unify return path
configure: escape colons in values written to config.fate
ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
matroska: Fix leaking memory allocated for laces.
pthread: Fix crash due to fctx->delaying not being cleared.
vp3: Assert on invalid filter_limit values.
h264: fix 10bit biweight functions after recent x86inc.asm fixes.
ffv1: Fix size mismatch in encode_line.
movenc: Remove a dead initialization
git-howto: Explain how to avoid Windows line endings in git checkouts.
build: Move all arch OBJS declarations into arch subdirectory Makefiles.
Conflicts:
configure
libavcodec/vp3.c
libavformat/matroskadec.c
libavutil/Makefile
libswscale/Makefile
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Fri, 13 Apr 2012 05:00:57 +0000 (22:00 -0700)]
avf: has_duration does not check the global one
Some container formats report a global duration, but not a per stream
one.
Ronald S. Bultje [Fri, 13 Apr 2012 18:06:39 +0000 (11:06 -0700)]
dsputil: fix optimized emu_edge function on Win64.
Recent register allocation changes (x86inc.asm update) changed the
register order and thus opcodes for the inner loops. One of them became
>128bytes, which confuses other parts of this function where it jumps
to fixed-offset positions to extend the edge by fixed amounts. A simple
register change fixes this.
Diego Biurrun [Sun, 1 Apr 2012 08:34:10 +0000 (10:34 +0200)]
swscale: K&R formatting cosmetics (part II)
Also adjust some comments including wording and typo fixes.
Alex Converse [Fri, 13 Apr 2012 01:22:07 +0000 (18:22 -0700)]
tiffdec: Add a malloc check and refactor another.
Alex Converse [Fri, 13 Apr 2012 01:10:57 +0000 (18:10 -0700)]
faxcompr: Check malloc results and unify return path
Michael Niedermayer [Thu, 12 Apr 2012 19:03:19 +0000 (21:03 +0200)]
av_image_alloc: Align the width to 8 when align >= 8.
This allows simd optimized routines to work in steps of 8 pixels
without going over the linesize. (this matters for yuv->rgb24 for example)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Apr 2012 16:38:10 +0000 (18:38 +0200)]
cmdutils: fix "oswr may be used uninitialized" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Apr 2012 16:21:51 +0000 (18:21 +0200)]
avpicture_layout: use a endian independant format for the palette.
This should fix the failing fate PAL8 tests.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Thu, 12 Apr 2012 20:32:33 +0000 (21:32 +0100)]
configure: escape colons in values written to config.fate
The fields in config.fate are colon-separated so any colons
within the fields should be escaped to prevent confusion.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Fri, 13 Apr 2012 10:09:32 +0000 (12:09 +0200)]
mov: zero sc->pb in mov_read_close()
Its bad to free things without zeroing them.
This fixes a potential issue when mov_read_close() would be called twice.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dale Curtis [Fri, 13 Apr 2012 00:50:55 +0000 (17:50 -0700)]
mov: Fix memory leaks on aborted header parsing.
If mov_read_header exits under error, the memory allocated is
not freed.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Apr 2012 09:52:19 +0000 (11:52 +0200)]
mov: zero extradata_size on deallocation of extradata.
This prevents the possibility of extradata and its size becoming desynced.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dale Curtis [Fri, 13 Apr 2012 00:14:35 +0000 (17:14 -0700)]
matroska: Fix leaking memory allocated for laces.
During error conditions matroska_parse_block may exit without
freeing the memory allocated for laces.
Found via valgrind: http://pastebin.com/E54k8QFU
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dale Curtis [Fri, 13 Apr 2012 01:02:33 +0000 (18:02 -0700)]
mov: Fix harmless OOB read.
Convert key_off initialize to use the same sc->keyframe_count as
used elsewhere in the function.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dale Curtis [Fri, 13 Apr 2012 00:12:27 +0000 (17:12 -0700)]
pthread: Fix crash due to fctx->delaying not being cleared.
corrects invalid return when avpkt->size == 0.
Reproducible with test case and ffplay -threads 2. Stack trace:
http://pastebin.com/PexZ4Uc0
Test case:
http://commondatastorage.googleapis.com/dalecurtis-shared/crash.ogm
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Thu, 12 Apr 2012 20:22:00 +0000 (16:22 -0400)]
ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
Fixes ac3-encode and eac3-encode FATE test failures with SSE2 disabled.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Dale Curtis [Fri, 13 Apr 2012 04:24:04 +0000 (21:24 -0700)]
matroska: Fix leaking memory allocated for laces.
During error conditions matroska_parse_block may exit without
freeing the memory allocated for laces.
Found via valgrind: http://pastebin.com/E54k8QFU
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Dale Curtis [Fri, 13 Apr 2012 00:12:27 +0000 (17:12 -0700)]
pthread: Fix crash due to fctx->delaying not being cleared.
Reproducible with test case and ffplay -threads 2. Stack trace:
http://pastebin.com/PexZ4Uc0
Test case:
http://commondatastorage.googleapis.com/dalecurtis-shared/crash.ogm
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Dale Curtis [Thu, 12 Apr 2012 23:07:10 +0000 (16:07 -0700)]
vp3: Assert on invalid filter_limit values.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Ronald S. Bultje [Thu, 12 Apr 2012 16:45:10 +0000 (09:45 -0700)]
h264: fix 10bit biweight functions after recent x86inc.asm fixes.
This should have been updated in the x86inc.asm update, but was
accidently forgotten.
Alex Converse [Fri, 13 Apr 2012 00:11:03 +0000 (17:11 -0700)]
ffv1: Fix size mismatch in encode_line.
Alex Converse [Fri, 13 Apr 2012 00:02:24 +0000 (17:02 -0700)]
movenc: Remove a dead initialization
Dale Curtis [Thu, 12 Apr 2012 23:07:10 +0000 (16:07 -0700)]
vp3: Assert on invalid filter_limit values.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 18:24:00 +0000 (20:24 +0200)]
ffmpeg: Compensate non monotonicity errors in the audio TSs.
Audio timestamps are passed through by default and when the input
doesnt contain clean timestamps this can lead to non monotonicity
errors. (rounding to a course timebase can cause this too)
Print a warning when the errors in the timestamps are large
Fixes Ticket1167 (regression since timestamps are passed through)
This is a generic workaround that is intended to handle
slightly incorrect input files. It is very possible that some
demuxers contain bugs that lead to wrong timestamps, these demuxers
should of course still be fixed even if this change happens to
hide the issue.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Apr 2012 22:39:19 +0000 (00:39 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libxvid: remove disabled code
qdm2: make a table static const
qdm2: simplify bitstream reader setup for some subpacket types
qdm2: use get_bits_left()
build: Consistently handle conditional compilation for all optimization OBJS.
avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
msrle: convert MS RLE decoding function to bytestream2.
x86inc improvements for 64-bit
Conflicts:
common.mak
libavcodec/avpacket.c
libavcodec/bfi.c
libavcodec/msrledec.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 12 Apr 2012 22:09:47 +0000 (00:09 +0200)]
lavfi/mp: remove 2xsai wrapped filter
It was ported to a native libavfilter filter.
Stefano Sabatini [Sun, 18 Mar 2012 09:59:01 +0000 (10:59 +0100)]
lavfi: port 2xsai filter from libmpcodecs
Partially based on the port by Niel van der Westhuizen
<nielkie@gmail.com>, done for GCI 2010. Same output as the original
filter and as fast.
See thread:
Subject: [FFmpeg-devel] [PATCH] Port MPlayer 2xSaI filter to libavfilter
Date: Thu, 25 Nov 2010 01:31:24 +1000
Stefano Sabatini [Wed, 11 Apr 2012 22:04:21 +0000 (00:04 +0200)]
examples/decoding_encoding: remove unused variable "size"
Remove unused variable size from video_encode_example() function.
Fix GCC warning:
decoding_encoding.c:214:22: warning: unused variable ‘size’ [-Wunused-variable]
Stefano Sabatini [Wed, 11 Apr 2012 22:02:30 +0000 (00:02 +0200)]
lavfi: install asrc_abuffer.h header
The header is part of the public API, in particular is used by
doc/examples/filtering_audio.c.
Diego Biurrun [Thu, 12 Apr 2012 17:42:26 +0000 (19:42 +0200)]
git-howto: Explain how to avoid Windows line endings in git checkouts.
Diego Biurrun [Mon, 6 Feb 2012 18:16:44 +0000 (19:16 +0100)]
build: Move all arch OBJS declarations into arch subdirectory Makefiles.
Reimar Döffinger [Wed, 11 Apr 2012 19:04:46 +0000 (21:04 +0200)]
vorbisdec: use correct channels variable.
All code should use the local variable, the
AVCodecContext might not yet have the updated value.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 10 Apr 2012 19:49:46 +0000 (21:49 +0200)]
latmenc: validate extradata size.
Fixes potential out-of-bounds writes.
This is mostly possible when muxing ALS files where from
an extradata size of about 1050 put_bits would write data
outside the buffer.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 10 Apr 2012 19:42:17 +0000 (21:42 +0200)]
latmenc: simplify using avpriv_copy_bits.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Mon, 9 Apr 2012 16:31:50 +0000 (18:31 +0200)]
latmenc: Document assumptions when copying the AAC header.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 8 Apr 2012 22:57:11 +0000 (00:57 +0200)]
latmenc: copy pce config from proper location.
For the FATE test sample used, this only avoids a warning
message.
However for other samples like al05_44.mp4 the converted
file can be played only after this fix.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 8 Apr 2012 22:10:07 +0000 (00:10 +0200)]
latmenc: fix muxing of byte-aligned DSE.
This will only work for DSEs that are first in a packet, but
that is enough to fix handling of the reference files in
fate-suite/aac (though most of them still have other issues).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun [Fri, 29 Jul 2011 10:49:23 +0000 (12:49 +0200)]
libxvid: remove disabled code
Michael Niedermayer [Thu, 12 Apr 2012 10:57:22 +0000 (12:57 +0200)]
ffmpeg: fix ticks_per_frame for the avi stream copy case
Should not make any difference, but its more correct.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Apr 2012 10:54:54 +0000 (12:54 +0200)]
ratecontrol: Use ticks_per_frame to calculate fps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jakub Stachowski [Wed, 11 Apr 2012 21:36:07 +0000 (23:36 +0200)]
wmalosslessdec: Reset residues to 0 if they were not decoded from bitstream.
If channel residues are have not been decoded from bitstream, they should be
initialized to 0 instead of using values from previous subframe.
This causes bursts of noise in silent parts of some files.
This patch fixes bug #1055
Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Reviewed-by: Mashiat Sarker Shakkhar <mashiat.sarker@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 11 Apr 2012 12:03:25 +0000 (13:03 +0100)]
qdm2: make a table static const
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 11 Apr 2012 12:02:43 +0000 (13:02 +0100)]
qdm2: simplify bitstream reader setup for some subpacket types
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 11 Apr 2012 10:54:31 +0000 (11:54 +0100)]
qdm2: use get_bits_left()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Thu, 12 Apr 2012 08:34:23 +0000 (10:34 +0200)]
msmpeg4enc: fix stored fps value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Apr 2012 08:13:11 +0000 (10:13 +0200)]
lavf: compute_pkt_fields, limit the pts upcorrection to mpeg
The pts correction conflicts with the ogg vorbis demuxer.
Thanks-to: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Wed, 11 Apr 2012 17:26:09 +0000 (19:26 +0200)]
ffmpeg: add -benchmark_all option.
Nicolas George [Wed, 11 Apr 2012 17:26:29 +0000 (19:26 +0200)]
ffmpeg: move getutime to the start of the file.
Diego Biurrun [Tue, 27 Mar 2012 21:10:02 +0000 (23:10 +0200)]
build: Consistently handle conditional compilation for all optimization OBJS.
Diego Biurrun [Sun, 1 Apr 2012 08:47:39 +0000 (10:47 +0200)]
avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
Michael Niedermayer [Wed, 11 Apr 2012 23:29:04 +0000 (01:29 +0200)]
mjpeg: fix crash with lowres and flipped images
Fixes Ticket1155
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Apr 2012 22:43:53 +0000 (00:43 +0200)]
vf_lut: fix rgba map regression
Fixes Ticket1184
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Tue, 10 Apr 2012 19:36:30 +0000 (21:36 +0200)]
lavf: always call avio_flush in av_write_trailer.
Otherwise for muxers like e.g. latmenc that never call
avio_flush (and do not have a write_trailer function)
a part of the data will always be missing.
Also update references for the voc muxer, which was also
buggy before and did not write out all data.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Wed, 11 Apr 2012 20:50:22 +0000 (22:50 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avplay: Don't free video filters string until the end of decoding.
movenc: small refactor mov_write_packet
movenc: remove redundant check
interplayvideo: fix av_dlog parameter type mismatch
Drop some pointless #ifdefs.
Conflicts:
libavcodec/interplayvideo.c
libavcodec/libxvidff.c
libavcodec/snowenc.c
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald Bultje [Sat, 31 Mar 2012 17:10:54 +0000 (17:10 +0000)]
msrle: convert MS RLE decoding function to bytestream2.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Reimar Döffinger [Tue, 10 Apr 2012 19:11:50 +0000 (21:11 +0200)]
latmenc: error out when packet size is too large.
Previously it would just silently write out incorrect data.
This also fixes a potential integer overflow in the allocation.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 10 Apr 2012 18:59:05 +0000 (20:59 +0200)]
latmenc: Fix ALS in LATM.
"Fix" in so far as at least it will no longer overread and possibly
crash and makes somewhat sense, but no idea whether there is anything
that can play the resulting files (FFmpeg can't).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 10 Apr 2012 19:46:56 +0000 (21:46 +0200)]
latmenc: remove unused return value.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Henrik Gramner [Wed, 4 Apr 2012 20:03:15 +0000 (20:03 +0000)]
x86inc improvements for 64-bit
Add support for all x86-64 registers
Prefer caller-saved register over callee-saved on WIN64
Support up to 15 function arguments
Also (by Ronald S. Bultje)
Fix up our asm to work with new x86inc.asm.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>