summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
...
* | dpcm: Round output buffer size up.Michael Niedermayer2012-01-26
| | | | | | | | | | | | | | Fixes: CVE-2011-3951 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | diracdec: Check num_refs.Michael Niedermayer2012-01-26
| | | | | | | | | | | | | | Fixes: CVE-2011-3950 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | diracdec: Check dirac_unpack_idwt_params parameters before storing them.Michael Niedermayer2012-01-26
| | | | | | | | | | | | | | Fixes CVE-2011-3949 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3dec: Check for memcpy size to be positive.Michael Niedermayer2012-01-26
| | | | | | | | | | | | No, ive no testcase. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix a heap-buffer-overflowThierry Foucu2012-01-26
| | | | | | | | | | | | In some case, what left to read from ptr is smaller than EXTRABYTES. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) wma: Clip WMA1 and WMA2 frame length to 11 bits. movenc: Don't require frame_size to be set for modes other than mov doc: Update APIchanges with info on muxer flushing movenc: Reindent a block tools: Remove some unnecessary #undefs. rv20: prevent calling ff_h263_decode_mba() with unset height/width tools: K&R reformatting cosmetics Ignore generated aviocat and ismindex tools. build: Automatically include architecture-specific library Makefile snippets. indeo5: prevent null pointer dereference on broken files pktdumper: Use usleep instead of sleep cosmetics: Remove some unnecessary block braces. Drop unnecessary prefix from *sink* variable and struct names. Add a tool for creating smooth streaming manifests movdec: Calculate an average bit rate for fragmented streams, too movenc: Write the sample rate instead of time scale in the stsd atom movenc: Add a separate ismv/isma (smooth streaming) muxer movenc: Allow the caller to decide on fragmentation libavformat: Add a flag for muxers that support write_packet(NULL) for flushing movenc: Add support for writing fragmented mov files ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges ffmpeg.c ffplay.c libavfilter/Makefile libavformat/Makefile libavformat/avformat.h libavformat/movenc.c libavformat/movenc.h libavformat/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wma: Clip WMA1 and WMA2 frame length to 11 bits.Alex Converse2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | The MDCT buffers in the decoder are only sized for up to 11 bits. The reverse engineered documentation for WMA1/2 headers say that that for all samplerates above 32kHz 11 bits are used. 12 and 13 bit support were added for WMAPro. I was unable to make any Microsoft tools generate a test file at a samplerate above 48kHz. Discovered by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * rv20: prevent calling ff_h263_decode_mba() with unset height/widthJanne Grunau2012-01-25
| | | | | | | | | | | | | | Prevents a crash of VLC during playback of a invalid matroska file, found by John Villamil <johnv@matasano.com>. CC: libav-stable@libav.org
| * build: Automatically include architecture-specific library Makefile snippets.Diego Biurrun2012-01-25
| |
| * indeo5: prevent null pointer dereference on broken filesJanne Grunau2012-01-25
| | | | | | | | Found by John Villamil <johnv@matasano.com>
| * cosmetics: Remove some unnecessary block braces.Diego Biurrun2012-01-25
| |
| * dsputil: use vertical component for drawing bottom edge.Ronald S. Bultje2012-01-25
| | | | | | | | | | Current code only writes 8 pixels of vertical edge for YUV422, which causes MC artifacts when subsequent frames use data from that edge.
* | mjpegbdec: Fix incorrect bitstream buffer size.Michael Niedermayer2012-01-25
| | | | | | | | | | | | | | Fixes CVE-2011-3947 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | r210, r10k and avrp encoderPaul B Mahol2012-01-25
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | kgv1dec: Increase offsets array size so it is large enough.Michael Niedermayer2012-01-25
| | | | | | | | | | | | | | Fixes CVE-2011-3945 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smackerdec: Check that the last indexes are within the table.Michael Niedermayer2012-01-25
| | | | | | | | | | | | | | Fixes CVE-2011-3944 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp3: Copy all 3 frames for thread updates.Michael Niedermayer2012-01-25
| | | | | | | | | | | | | | | | This fixes a double release of the current frame on deinit. Fixes CVE-2011-3934 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo3: fix motion vector validationHendrik Leppkes2012-01-25
| | | | | | | | | | | | | | The index of the motion vector has to be checked before being multiplied by 2 for the array index. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h263dec: Disallow width/height changing with frame threads.Michael Niedermayer2012-01-25
| | | | | | | | | | | | | | Fixes CVE-2011-3937 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix multi-channel encoding with libfaac.Carl Eugen Hoyos2012-01-25
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) aacenc: Fix identification padding when the bitstream is already aligned. aacenc: Write correct length for long identification strings. aud: remove unneeded field, audio_stream_index from context aud: fix time stamp calculation for ADPCM IMA WS aud: simplify header parsing aud: set pts_wrap_bits to 64. cosmetics: indentation aud: support Westwood SND1 audio in AUD files. adpcm_ima_ws: fix stereo decoding avcodec: add a new codec_id for CRYO APC IMA ADPCM. vqa: remove unused context fields, audio_samplerate and audio_bits vqa: clean up audio header parsing vqa: set time base to frame rate as coded in the header. vqa: set packet duration. vqa: use 1/sample_rate as the audio stream time base vqa: set stream start_time to 0. lavc: postpone the removal of AVCodecContext.request_channels. lavf: postpone removing av_close_input_file(). lavc: postpone removing old audio encoding and decoding API avplay: remove the -er option. ... Conflicts: Changelog libavcodec/version.h libavdevice/v4l.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacenc: Fix identification padding when the bitstream is already aligned.Alex Converse2012-01-24
| |
| * aacenc: Write correct length for long identification strings.Michael Niedermayer2012-01-24
| | | | | | | | | | | | | | When the length is the escape value (15), the new length is calculated by 15 + get_bits(8) - 1. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * adpcm_ima_ws: fix stereo decodingJustin Ruggles2012-01-24
| | | | | | | | | | Stereo ADPCM IMA WS is planar for VQA version 3 and 2-sample interleaved for VQA version 2.
| * avcodec: add a new codec_id for CRYO APC IMA ADPCM.Justin Ruggles2012-01-24
| | | | | | | | | | The stereo layout and extradata is significantly different from that in Westwood IMA ADPCM, so a separate codec_id is warranted.
| * lavc: postpone the removal of AVCodecContext.request_channels.Anton Khirnov2012-01-24
| | | | | | | | | | | | Although it has been deprecated for a long time, its intended replacement (request_channel_layout) is not actually used anywhere, so request_channels is currently the only way to access that functionality.
| * lavc: postpone removing old audio encoding and decoding APIAnton Khirnov2012-01-24
| | | | | | | | It has been deprecated only recently.
| * rv10: verify slice offsets against buffer sizeJanne Grunau2012-01-24
| | | | | | | | Found by John Villamil <johnv@matasano.com> in fuzzed rv20 in mkv files.
* | error concealment: initialize block index.Michael Niedermayer2012-01-24
| | | | | | | | | | | | | | Fixes CVE-2011-3941 (out of bounds write) Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: Disallow w/h/pixfmt changes for frame threads.Michael Niedermayer2012-01-24
| | | | | | | | | | | | | | | | | | | | | | Previously this was just checked in case of slice threads, but frame threads do not support this either currently. Making them support this is of course the long term goal Fixes bug155 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: Draw edges based on the pictures linesize instead of the contexts.Michael Niedermayer2012-01-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Remove ffmpeg. aacenc: Simplify windowing aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples. aacenc: Deinterleave input samples before processing. aacenc: Store channel count in AACEncContext. aacenc: Move Q^3/4 calculation to it's own table aacenc: Request normalized float samples instead of converting s16 samples to float. aacpsy: Replace an if with FFMAX in LAME windowing. aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated. aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons aacenc: cosmetics: move init() and end() to the bottom of the file. aacenc: aac_encode_init() cleanup XWD encoder and decoder vc1: don't read the interpfrm and bfraction elements for interlaced frames mxfdec: fix memleak on mxf_read_close() westwood: split the AUD and VQA demuxers into separate files. Conflicts: .gitignore Changelog Makefile configure doc/ffmpeg.texi ffmpeg.c libavcodec/Makefile libavcodec/aacenc.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/img2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacenc: Simplify windowingNathan Caldwell2012-01-23
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacenc: Move saved overlap samples to the beginning of the same buffer as ↵Nathan Caldwell2012-01-23
| | | | | | | | | | | | incoming samples. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacenc: Deinterleave input samples before processing.Nathan Caldwell2012-01-23
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacenc: Store channel count in AACEncContext.Nathan Caldwell2012-01-23
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacenc: Move Q^3/4 calculation to it's own tableNathan Caldwell2012-01-23
| | | | | | | | | | | | This should be moved to tablegen at some point. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacenc: Request normalized float samples instead of converting s16 samples ↵Nathan Caldwell2012-01-23
| | | | | | | | | | | | to float. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacpsy: Replace an if with FFMAX in LAME windowing.Nathan Caldwell2012-01-23
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make ↵Nathan Caldwell2012-01-23
| | | | | | | | | | | | it more clear what is being calculated. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisonsNathan Caldwell2012-01-23
| | | | | | | | | | | | Also fix a typo. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacenc: cosmetics: move init() and end() to the bottom of the file.Nathan Caldwell2012-01-23
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * aacenc: aac_encode_init() cleanupNathan Caldwell2012-01-23
| | | | | | | | | | | | Macroify sanity checks and check return values of allocs and other functions. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * XWD encoder and decoderPaul B Mahol2012-01-23
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * vc1: don't read the interpfrm and bfraction elements for interlaced framesHendrik Leppkes2012-01-23
| | | | | | | | | | | | | | This matches the spec as well as the reference decoder, and fixes a bug with interlaced frame decoding. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | Revert "Fix multi-channel AAC encoding."Michael Niedermayer2012-01-24
| | | | | | | | | | | | | | | | | | | | This reverts commit b3452771c4550b46ea54d15be6cfe8cc10585199. A better solution was implemented by Nathan Caldwell. Conflicts: libavcodec/aacenc.c
* | Improve support for PGS subtitles.David Mitchell2012-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation assumed that a new picture would always supersede the previous picture. Similarly, presentation segments were assumed to pertain to the most-recently-read picture. However, each presentation segment may refer to 0 or more pictures by their ID. Picture IDs may repeat, and a repeated picture ID indicates that the old picture for that ID is no longer needed and may be discarded. The new implementation allocates a buffer with one slot for each possible picture ID (the picture ID is a 16-bit field) and properly decodes presentation segments so that all relevant pictures are output upon encountering a display segment. Given that most PGS streams are unlikely to use more than a small fraction of the available picture IDs, it would probably be better to use a more memory-efficient data structure. I'm lazy though, so I leave this to a more motivated individual. I've tested the code with MKV files in VLC (a recent revision from their git repo) and with HandBrake (a version that I hacked up to use ffmpeg's PGS subtitle decoder). Review-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pthreads: Generic progress lubrication support.Michael Niedermayer2012-01-23
| | | | | | | | | | | | Fixes bug118, bug120 and bug125 at least Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pthreads: reset got_frames on flush.Michael Niedermayer2012-01-23
| | | | | | | | | | | | | | This fixes memory corruption when seeking in broken streams. a random mpeg4 in nut file was used to debug. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) riff: fix invalid av_freep() calls on EOF in ff_read_riff_info pam: Fix a typo that broke writing and reading PAM files. mxfdec: fix memleak on av_realloc failures mxfdec: Do not parse slices or DeltaEntryArrays. mxfdec: hybrid demuxing/seeking solution mxfdec: Add Avid's essence element key. mfxdec: Separate mxf_essence_container_uls for audio and video. mxfdec: Compute packet offsets properly. mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack. mxfdec: use av_dlog() for 'no corresponding source package found' mxfdec: Make mxf->partitions sorted by offset. mxfdec: parse ThisPartition mxfdec: Speed up metadata and index parsing. mxfdec: Make sure DataDefinition is consistent between material track and source track. mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf mxfdec: Add hack that adjusts the n_delta calculation when system items are present. mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays. mxfdec: Move FooterPartition to MXFContext and make sure it is never zero. mxfdec: check return value of avio_seek mxfdec: skip to end of structural sets ... Conflicts: configure libavcodec/pnm.c libavformat/mxfdec.c libavformat/riff.c libavformat/rtsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 00:28:17 +0000