aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * h264: disallow constrained intra prediction modes for luma.Ronald S. Bultje2012-02-265-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conversion of the luma intra prediction mode to one of the constrained ("alzheimer") ones can happen by crafting special bitstreams, causing a crash because we'll call a NULL function pointer for 16x16 block intra prediction, since constrained intra prediction functions are only implemented for chroma (8x8 blocks). Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 45b7bd7c53b41bc5ff6fc2158831f2b1b1256113) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * swscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case.Ronald S. Bultje2012-02-261-12/+12
| | | | | | | | | | | | | | | | | | Fixes bug 221. CC: libav-stable@libav.org (cherry picked from commit b7542dd3d71d1ee873277020b6a8eab2674bb167) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * libavcodec: Don't crash in avcodec_encode_audio if time_base isn't setMartin Storsjö2012-02-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier, calling avcodec_encode_audio worked fine even if time_base wasn't set. Now it crashes due to trying to scale the output pts to the codec context time base. This affects e.g. VLC. If no time_base is set for audio codecs, set it to the sample rate. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 9a7dc618c50902e7a171f2deda6430d52c277a95) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * qdm2: Check data block size for bytes to bits overflow.Alex Converse2012-02-261-0/+4
| | | | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit dac56d9ce01eb9963f28f26b97a81db5cbd46c1c) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().Anton Khirnov2012-02-264-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | This way, if the AVCodecContext is allocated for a specific codec, the caller doesn't need to store this codec separately and then pass it again to avcodec_open2(). It also allows to set codec private options using av_opt_set_* before opening the codec. (cherry picked from commit bc901998487bf9b77a423961d9f961bcc28a9291) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * lavc: make avcodec_close() work properly on unopened codecs.Anton Khirnov2012-02-262-9/+22
| | | | | | | | | | | | | | I.e. free the priv_data and other stuff allocated in avcodec_alloc_context3() and not segfault. (cherry picked from commit 0e72ad95f9fef6a6b8ae55e47339a5c40526502f)
| * lavc: add avcodec_is_open().Anton Khirnov2012-02-266-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | It allows to check whether an AVCodecContext is open in a documented way. Right now the undocumented way this check is done in lavf/lavc is by checking whether AVCodecContext.codec is NULL. However it's desirable to be able to set AVCodecContext.codec before avcodec_open2(). (cherry picked from commit af08d9aeea870de017139f7b1c44b7d816cf8e56) Conflicts: doc/APIchanges
* | qpeg: Fix out of array writes.Michael Niedermayer2012-03-161-0/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | srtdec: fix a format string vulnerability.Fabian Greffrath2012-03-161-2/+2
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit aaa1173de775b9b865a714abcc270816d2f59dff)
* | aacenc: Fix LONG_START windowing.Nathan Caldwell2012-03-161-2/+2
| | | | | | | | | | | | | | | | | | Forgot to add the equivalent amount to the incoming sample pointer as the output pointer. Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 2e626dd5136f4daa244b37284e22483cdc7df1ac) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.Nathan Caldwell2012-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | 10l: Forgot to adjust deinterleave for new location of incoming samples in 7946a5a. This produced incorrect, but surprisingly listenable results. Thanks to Justin Ruggles for the report. Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit dc7e7d4dd96eebd430e7bfa847b751add0e126ab) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wavpack: Don't shift minclip/maxclipDerek Buitenhuis2012-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are clipping before we shift the values to 16 or 32 bits, we should not shift the min/max clip values to compensate. Fixes 8 and 24 bit lossy decoding. Fixes ticket #871. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 480b133e6f79c470aff0f84d9ed3648d37c32b03)
* | Revert "Improve decoding quality for lossy wavpack."Michael Niedermayer2012-02-251-7/+18
| | | | | | | | | | | | | | This has been implemented more correctly. This reverts commit a915618a29f3f4197832151a4ed03ccdd585f9cf. (cherry picked from commit 32e74395a8e88dee1c149aeb36e7a21df431c181)
* | Fix ffmpeg -codecs output.Carl Eugen Hoyos2012-02-181-1/+1
| | | | | | | | (cherry picked from commit f6492476a63938cc66c51bf61c88407b7749f780)
* | wavpack: add needed braces for 2 statements inside an if blockJustin Ruggles2012-02-121-1/+2
| | | | | | | | (cherry picked from commit 9d7cee50aa349563aa5faca1cff256ffccff6551)
* | Improve decoding quality for lossy wavpack.Carl Eugen Hoyos2012-01-291-18/+7
| | | | | | | | | | | | | | | | | | This reverts e6e7bfc1 and 365e1ec2. The code may be incorrect both before and after the revert, but we do not have any samples that were fixed by the original commits. Fixes ticket #871. (cherry picked from commit a915618a29f3f4197832151a4ed03ccdd585f9cf)
* | doc: remove doc/ffmpeg-mt-authorship.txt for release/0.10n0.10Michael Niedermayer2012-01-261-4561/+0
| | | | | | | | | | | | | | we dont carry the whole git history in releases so theres no point in having this in them either. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Update for 0.10Michael Niedermayer2012-01-263-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | qdm2: Check data block size for bytes to bits overflow.Alex Converse2012-01-261-0/+4
| | | | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit dac56d9ce01eb9963f28f26b97a81db5cbd46c1c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ismindex: Fix build on mingwMartin Storsjö2012-01-261-0/+4
| | | | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 8801fac365549a43a639e239faba409d8f91ef86) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Changelog: remove duplicate linesMichael Niedermayer2012-01-261-4/+0
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | RELEASE_NOTES: update for 0.10Michael Niedermayer2012-01-261-30/+5
| | | | | | | | | | | | | | remove minor things and things that we had in many previous releases already. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Changelog: update for 0.10Michael Niedermayer2012-01-261-0/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dv: Fix out of array readMichael Niedermayer2012-01-261-4/+6
| | | | | | | | | | | | | | Fixes part of CVE-2011-3936 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: Fix seeking regression in fragemnted movs.Michael Niedermayer2012-01-261-0/+3
| | | | | | | | | | | | Regression introduced in 550f7c43ece1af27604407647d10e74b52e6fedf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | snowenc: dont crash with gray but exit with an error msg.Michael Niedermayer2012-01-261-1/+1
| | | | | | | | | | | | Fixes Ticket839 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_sei: Fix infinite loop.Michael Niedermayer2012-01-261-0/+4
| | | | | | | | | | | | | | Fixes not yet fixed parts of CVE-2011-3946. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix -qscale X breaking audio codecsMichael Niedermayer2012-01-261-1/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg1videoenc: disable slice threadsMichael Niedermayer2012-01-261-1/+1
| | | | | | | | | | | | It doesnt work (and as far as i tested also didnt in the past) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | kvmc: Check palsize.Michael Niedermayer2012-01-261-0/+5
| | | | | | | | | | | | | | Fixes: CVE-2011-3952 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: increase padding on several more extradata allocations.Michael Niedermayer2012-01-261-2/+2
| | | | | | | | | | Inspired by: 5af569aa30b93f56344ea540936eb671760f568c by alex Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: Pad AAC extradata.Alex Converse2012-01-261-1/+1
| | | | | | | | | | | | | | | | | | 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-261-1/+4
| | | | | | | | | | | | | | 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-261-1/+7
| | | | | | | | | | | | | | 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-261-15/+14
| | | | | | | | | | | | | | 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-261-1/+1
| | | | | | | | | | | | metadata is already plural. Found-by: Alexander Strasser
* | mp3dec: Check for memcpy size to be positive.Michael Niedermayer2012-01-261-1/+2
| | | | | | | | | | | | No, ive no testcase. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix a heap-buffer-overflowThierry Foucu2012-01-261-1/+2
| | | | | | | | | | | | 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-2633-393/+1299
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+6
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | movenc: Reindent a blockMartin Storsjö2012-01-251-13/+15
| | | | | | | | | | | | | | | | | | | | | 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-252-3/+0
| | |
| * | rv20: prevent calling ff_h263_decode_mba() with unset height/widthJanne Grunau2012-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | 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-259-133/+158
| | |
| * | Ignore generated aviocat and ismindex tools.Diego Biurrun2012-01-251-0/+2
| | |
| * | build: Automatically include architecture-specific library Makefile snippets.Diego Biurrun2012-01-253-4/+1
| | |
| * | indeo5: prevent null pointer dereference on broken filesJanne Grunau2012-01-251-0/+4
| | | | | | | | | | | | Found by John Villamil <johnv@matasano.com>
| * | pktdumper: Use usleep instead of sleepMartin Storsjö2012-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 22:38:19 +0000