aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | mov: Fix memory leaks on aborted header parsing.Dale Curtis2012-04-131-33/+41
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | mov: zero extradata_size on deallocation of extradata.Michael Niedermayer2012-04-131-0/+5
| | | | | | | | | | | | | | | | | | This prevents the possibility of extradata and its size becoming desynced. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | matroska: Fix leaking memory allocated for laces.Dale Curtis2012-04-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | mov: Fix harmless OOB read.Dale Curtis2012-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | pthread: Fix crash due to fctx->delaying not being cleared.Dale Curtis2012-04-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | vp3: Assert on invalid filter_limit values.Dale Curtis2012-04-131-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffmpeg: Compensate non monotonicity errors in the audio TSs.Michael Niedermayer2012-04-131-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-1335-981/+960
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | libxvid: remove disabled codeDiego Biurrun2012-04-121-4/+0
| | |
| * | qdm2: make a table static constMans Rullgard2012-04-121-1/+1
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * | qdm2: simplify bitstream reader setup for some subpacket typesMans Rullgard2012-04-121-20/+26
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * | qdm2: use get_bits_left()Mans Rullgard2012-04-121-25/+21
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * | build: Consistently handle conditional compilation for all optimization OBJS.Diego Biurrun2012-04-129-24/+33
| | |
| * | avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmeticsDiego Biurrun2012-04-124-479/+472
| | |
| * | msrle: convert MS RLE decoding function to bytestream2.Ronald Bultje2012-04-116-80/+85
| | | | | | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * | x86inc improvements for 64-bitHenrik Gramner2012-04-1113-341/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | lavfi/mp: remove 2xsai wrapped filterStefano Sabatini2012-04-135-341/+1
| | | | | | | | | | | | It was ported to a native libavfilter filter.
* | | lavfi: port 2xsai filter from libmpcodecsStefano Sabatini2012-04-137-1/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | examples/decoding_encoding: remove unused variable "size"Stefano Sabatini2012-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | Remove unused variable size from video_encode_example() function. Fix GCC warning: decoding_encoding.c:214:22: warning: unused variable ‘size’ [-Wunused-variable]
* | | lavfi: install asrc_abuffer.h headerStefano Sabatini2012-04-133-3/+6
| | | | | | | | | | | | | | | The header is part of the public API, in particular is used by doc/examples/filtering_audio.c.
* | | vorbisdec: use correct channels variable.Reimar Döffinger2012-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | 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>
* | | latmenc: validate extradata size.Reimar Döffinger2012-04-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | latmenc: simplify using avpriv_copy_bits.Reimar Döffinger2012-04-121-6/+4
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | latmenc: Document assumptions when copying the AAC header.Reimar Döffinger2012-04-121-0/+2
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | latmenc: copy pce config from proper location.Reimar Döffinger2012-04-122-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | latmenc: fix muxing of byte-aligned DSE.Reimar Döffinger2012-04-123-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | ffmpeg: fix ticks_per_frame for the avi stream copy caseMichael Niedermayer2012-04-121-0/+1
| | | | | | | | | | | | | | | | | | Should not make any difference, but its more correct. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ratecontrol: Use ticks_per_frame to calculate fps.Michael Niedermayer2012-04-121-5/+9
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | wmalosslessdec: Reset residues to 0 if they were not decoded from bitstream.Jakub Stachowski2012-04-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | msmpeg4enc: fix stored fps valueMichael Niedermayer2012-04-121-1/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavf: compute_pkt_fields, limit the pts upcorrection to mpegMichael Niedermayer2012-04-121-1/+4
| | | | | | | | | | | | | | | | | | | | | The pts correction conflicts with the ogg vorbis demuxer. Thanks-to: Justin Ruggles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffmpeg: add -benchmark_all option.Nicolas George2012-04-123-1/+36
| | |
* | | ffmpeg: move getutime to the start of the file.Nicolas George2012-04-121-18/+18
| | |
* | | mjpeg: fix crash with lowres and flipped imagesMichael Niedermayer2012-04-121-0/+4
| | | | | | | | | | | | | | | | | | Fixes Ticket1155 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | vf_lut: fix rgba map regressionMichael Niedermayer2012-04-121-3/+5
| | | | | | | | | | | | | | | | | | Fixes Ticket1184 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavf: always call avio_flush in av_write_trailer.Reimar Döffinger2012-04-123-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-116-39/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | avplay: Don't free video filters string until the end of decoding.Alex Converse2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | av_freep()ing inside configure_video_filters() leaves a dangling reference in the calling code, and the filter string is needed again when reconfiguring video filters for a size change.
| * | movenc: small refactor mov_write_packetLuca Barbato2012-04-111-27/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Share the formerly internal write_packet with the hinter and move the fragment flush logic to the user facing one since it is not concerned about movtrack-only streams. Fixes bug #263 Signed-off-by: Martin Storsjö <martin@martin.st>
| * | movenc: remove redundant checkLuca Barbato2012-04-111-3/+0
| | | | | | | | | | | | | | | | | | The proper check is already in mov_write_header. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | interplayvideo: fix av_dlog parameter type mismatchDiego Biurrun2012-04-111-2/+3
| | | | | | | | | | | | libavcodec/interplayvideo.c:909:13: warning: format ‘%p’ expects argument of type ‘void *’, but argument 7 has type ‘GetByteContext’ [-Wformat]
| * | Drop some pointless #ifdefs.Diego Biurrun2012-04-103-8/+0
| | | | | | | | | | | | The files are only compiled if the #ifdef conditions are met.
* | | latmenc: error out when packet size is too large.Reimar Döffinger2012-04-111-1/+11
| | | | | | | | | | | | | | | | | | | | | 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>
* | | latmenc: Fix ALS in LATM.Reimar Döffinger2012-04-111-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | "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>
* | | latmenc: remove unused return value.Reimar Döffinger2012-04-111-3/+1
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | latmenc: remove dead code.Reimar Döffinger2012-04-111-3/+0
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | h261: move tables from header to .c file.Reimar Döffinger2012-04-115-152/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently they end up twice in the binary, since both encoder and decoder include the header and thus each gets their own copy. This is clearly nonsense for the const tables, but shouldn't be necessary for the RLTable either. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | ff_samples_to_time_base: support AV_NOPTS_VALUEMichael Niedermayer2012-04-111-0/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Fix memory leaks on failed ff_h264_decode_init()Dale Curtis2012-04-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During failure conditions ff_h264_decode_init() leaks memory allocated for nal units. Found via valgrind. Valgrind traces: http://pastebin.com/GqTqxs8T Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | oggparsevorbis: Remove code messing with cur_dts.Michael Niedermayer2012-04-111-1/+0
| | | | | | | | | | | | | | | | | | | | | This code caused first_dts to become corrupt and in value to be around relative_ts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>