summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * cosmetics: Remove some unnecessary block braces.Diego Biurrun2012-01-253-31/+17
| |
| * Drop unnecessary prefix from *sink* variable and struct names.Diego Biurrun2012-01-254-18/+18
| |
| * Add a tool for creating smooth streaming manifestsMartin Storsjö2012-01-252-1/+515
| | | | | | | | | | | | | | | | 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-252-1/+15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Write the sample rate instead of time scale in the stsd atomMartin Storsjö2012-01-251-2/+2
| | | | | | | | | | | | | | 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-255-5/+142
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Allow the caller to decide on fragmentationMartin Storsjö2012-01-252-8/+21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavformat: Add a flag for muxers that support write_packet(NULL) for flushingMartin Storsjö2012-01-253-5/+25
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Add support for writing fragmented mov filesMartin Storsjö2012-01-254-11/+426
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Add a separate start_ptsMartin Storsjö2012-01-252-2/+6
| | | | | | | | | | | | | | | | 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-251-1/+1
| | | | | | | | | | 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-251-2/+1
| | | | | | | | | | | | | | 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-256-8/+132
| | | | | | | | | | 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-251-2/+2
| | | | | | | | | | | | | | 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-251-9/+31
| | | | | | | | | | | | 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-251-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status