aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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>
* | | Remove avconvMichael Niedermayer2012-01-254-5737/+1
| | | | | | | | | | | | | | | | | | 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-251-0/+5
| | | | | | | | | | | | | | | | | | | | | 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-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-251-3/+2
| | | | | | | | | | | | | | | | | | | | | 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-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-7/+7
| | |
* | | ffmpeg: add image size check to codec_get_buffer()Michael Niedermayer2012-01-251-0/+3
| | | | | | | | | | | | | | | | | | | | | 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-251-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-2/+7
| | | | | | | | | | | | | | | | | | | | | 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-251-4/+4
| | | | | | | | | | | | | | | | | | | | | 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-251-0/+10
| | |
* | | buildsystem: 10l add v4l entry backMichael Niedermayer2012-01-251-0/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | v4l: fix compilationMichael Niedermayer2012-01-251-3/+0
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-2418-92/+152
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-241-1/+1
| | |
| * | aacenc: Write correct length for long identification strings.Michael Niedermayer2012-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | 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>
| * | aud: remove unneeded field, audio_stream_index from contextJustin Ruggles2012-01-241-10/+1
| | | | | | | | | | | | | | | There is only one stream, so it will always be index 0. This also allows for removal of the private context.
| * | aud: fix time stamp calculation for ADPCM IMA WSJustin Ruggles2012-01-241-9/+1
| | | | | | | | | | | | also allows for removing some unused context fields
| * | aud: simplify header parsingJustin Ruggles2012-01-241-22/+27
| | | | | | | | | | | | also allows for removing some unused context fields
| * | aud: set pts_wrap_bits to 64.Justin Ruggles2012-01-241-1/+1
| | | | | | | | | | | | Time stamps are not read from the bitstream, so no wrapping is needed.
| * | cosmetics: indentationJustin Ruggles2012-01-241-8/+8
| | |
| * | aud: support Westwood SND1 audio in AUD files.Justin Ruggles2012-01-241-6/+26
| | | | | | | | | | | | | | | | | | | | | Fixes decoding of the handful of "death scream" samples from "Command and Conquer" that use SND1. e.g. http://samples.libav.org/game-formats/westwood-aud/nuyell1.aud http://samples.libav.org/game-formats/westwood-aud/nuyell7.aud
| * | adpcm_ima_ws: fix stereo decodingJustin Ruggles2012-01-242-1/+35
| | | | | | | | | | | | | | | 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-248-5/+12
| | | | | | | | | | | | | | | The stereo layout and extradata is significantly different from that in Westwood IMA ADPCM, so a separate codec_id is warranted.
| * | vqa: remove unused context fields, audio_samplerate and audio_bitsJustin Ruggles2012-01-241-4/+0
| | |
| * | vqa: clean up audio header parsingJustin Ruggles2012-01-241-17/+30
| | | | | | | | | | | | | | | Fix setting of bit_rate and bits_per_coded_sample. Ask for sample for unsupported VQA versions.
| * | vqa: set time base to frame rate as coded in the header.Justin Ruggles2012-01-241-2/+7
| | | | | | | | | | | | | | | According to Multimedia Wiki documentation, the frame rate is not always 15, and the actual value can be found in the header.
| * | vqa: set packet duration.Justin Ruggles2012-01-241-5/+3
| | | | | | | | | | | | Also remove unused context field, audio_frame_counter.
| * | vqa: use 1/sample_rate as the audio stream time baseJustin Ruggles2012-01-241-1/+2
| | |
| * | vqa: set stream start_time to 0.Justin Ruggles2012-01-241-0/+2
| | | | | | | | | | | | | | | The format has no coded timestamps and must use packet durations to generate them.
| * | lavc: postpone the removal of AVCodecContext.request_channels.Anton Khirnov2012-01-241-1/+1
| | | | | | | | | | | | | | | | | | 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.
| * | lavf: postpone removing av_close_input_file().Anton Khirnov2012-01-241-1/+1
| | | | | | | | | | | | It has been deprecated only recently.
| * | lavc: postpone removing old audio encoding and decoding APIAnton Khirnov2012-01-241-2/+2
| | | | | | | | | | | | It has been deprecated only recently.