summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | matroskadec: Pad AAC extradata.Alex Converse2012-01-26
| | | | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit d2ee8c17793201ce969afd1f433ba1580c143cd2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
* | doc: remove trailing 's' to metadata.Clément Bœsch2012-01-26
| | | | | | | | | | | | metadata is already plural. Found-by: Alexander Strasser
* | 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
| * movenc: Don't require frame_size to be set for modes other than movMartin Storsjö2012-01-25
| | | | | | | | | | | | | | | | | | The field frame_size isn't written to the output anywhere except than in mov. This facilitates stream copy from formats that don't set frame_size. Signed-off-by: Martin Storsjö <martin@martin.st>
| * doc: Update APIchanges with info on muxer flushingMartin Storsjö2012-01-25
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Reindent a blockMartin Storsjö2012-01-25
| | | | | | | | | | | | | | Also add some space around operators and wrap a comment that extends past the 80 char "limit"/guideline. Signed-off-by: Martin Storsjö <martin@martin.st>
| * tools: Remove some unnecessary #undefs.Diego Biurrun2012-01-25
| |
| * 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
| * tools: K&R reformatting cosmeticsDiego Biurrun2012-01-25
| |
| * Ignore generated aviocat and ismindex tools.Diego Biurrun2012-01-25
| |
| * 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>
| * pktdumper: Use usleep instead of sleepMartin Storsjö2012-01-25
| | | | | | | | | | | | | | | | MinGW doesn't have sleep, only _sleep (which is deprecated), Sleep (which is defined in winbase.h and not in the standard C headers) and usleep. Signed-off-by: Martin Storsjö <martin@martin.st>
| * cosmetics: Remove some unnecessary block braces.Diego Biurrun2012-01-25
| |
| * Drop unnecessary prefix from *sink* variable and struct names.Diego Biurrun2012-01-25
| |
| * Add a tool for creating smooth streaming manifestsMartin Storsjö2012-01-25
| | | | | | | | | | | | | | | | It can also optionally split the file into individual fragments, which allows it to be served from any web server without any server side support. Signed-off-by: Martin Storsjö <martin@martin.st>
| * movdec: Calculate an average bit rate for fragmented streams, tooMartin Storsjö2012-01-25
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Write the sample rate instead of time scale in the stsd atomMartin Storsjö2012-01-25
| | | | | | | | | | | | | | For ismv/isma, the time scale might not be the same as the sample rate. Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Add a separate ismv/isma (smooth streaming) muxerMartin Storsjö2012-01-25
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Allow the caller to decide on fragmentationMartin Storsjö2012-01-25
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavformat: Add a flag for muxers that support write_packet(NULL) for flushingMartin Storsjö2012-01-25
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Add support for writing fragmented mov filesMartin Storsjö2012-01-25
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Add a separate start_ptsMartin Storsjö2012-01-25
| | | | | | | | | | | | | | | | This fixes calculation of trackDuration if the MOVIentry array is cleared. This is required by the fragmentation support in the next patch. Signed-off-by: Martin Storsjö <martin@martin.st>
| * 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>
* | doc/ffmpeg.texiMichael Niedermayer2012-01-25
| | | | | | | | | | | | Merge changes from avconv.texi since the last merge into ffmpeg.texi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | remove avconv from DoxyfileLou Logan2012-01-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove avconvMichael Niedermayer2012-01-25
| | | | | | | | | | | | All features have been merged into ffmpeg. 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>
* | dv: Fix null pointer dereference due to ach=0Michael Niedermayer2012-01-25
| | | | | | | | | | | | | | | | Fixes part2 of CVE-2011-3929 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dv: check stypeMichael Niedermayer2012-01-25
| | | | | | | | | | | | | | | | | | Fixes part1 of CVE-2011-3929 Possibly fixes part of CVE-2011-3936 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: Makefile: cosmetics: align FFLIBS.Nicolas George2012-01-25
| |
* | ffmpeg: add image size check to codec_get_buffer()Michael Niedermayer2012-01-25
| | | | | | | | | | | | | | Fixes CVE-2011-3935 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: Fix regression with chunks that are larger than the file.Michael Niedermayer2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes the check specific to the case that needs it. Regression was introduced by commit 62adc60b97d854507d07a21b2f370ab5c69e6b7b Author: Michael Niedermayer <michaelni@gmx.at> Date: Fri Dec 16 06:13:04 2011 +0100 avidec: Check that the header chunks fit in the available filesize. Fixes Ticket771 Bug found by: Diana Elena Muscalu Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 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>
* | nsvdec: Fix use of uninitialized streams.Michael Niedermayer2012-01-25
| | | | | | | | | | | | | | Fixes CVE-2011-3940 (Out of bounds read resulting in out of bounds write) 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
| |
* | buildsystem: 10l add v4l entry backMichael Niedermayer2012-01-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | v4l: fix compilationMichael Niedermayer2012-01-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 23:05:09 +0000