aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
| * lavf: remove disabled FF_API_FORMAT_PARAMETERS cruftAnton Khirnov2012-01-273-260/+0
| | | | | | | | | | Also remove now unused AVFormatParameters struct and AVOutputFormat.set_parameters().
| * lavf: remove disabled FF_API_OLD_METADATA2 cruftAnton Khirnov2012-01-274-113/+2
| |
| * lavf: remove disabled FF_API_OLD_AVIO cruftAnton Khirnov2012-01-276-672/+1
| |
| * lavf: increase major version from 53 to 54.Anton Khirnov2012-01-271-2/+2
| |
| * lavf: remove AVFormatParameters from AVFormatContext.read_header signatureAnton Khirnov2012-01-27116-179/+128
| |
* | Merge remote-tracking branch 'qatar/master'n0.11-devMichael Niedermayer2012-01-272-10/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: smacker: Sanity check huffman tables found in the headers. smacker: remove dead store qdm2: Check data block size for bytes to bits overflow. mxfdec: Fix files with essence containers larger than 2 GiB. mxfdec: Employ correct printf conversion specifiers for POSIX int types. vc1: always read the bfraction element for interlaced fields fate: add XWD image regression test lavf: prevent infinite loops while flushing in avformat_find_stream_info matroskadec: Pad AAC extradata. ismindex: Fix build on mingw Conflicts: libavformat/mxfdec.c libavformat/utils.c tests/lavf-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxfdec: Fix files with essence containers larger than 2 GiB.Tomas Härdin2012-01-261-1/+1
| | | | | | | | | | | | For such files, accumulating into an int would cause an overflow. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Employ correct printf conversion specifiers for POSIX int types.Jean First2012-01-261-5/+10
| | | | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * lavf: prevent infinite loops while flushing in avformat_find_stream_infoJanne Grunau2012-01-261-8/+14
| | | | | | | | | | | | | | | | | | If no data was seen for a stream decoder are returning 0 when fed with empty packets for flushing. We can stop flushing when the decoder does not return delayed delayed frames anymore. Changes try_decode_frame() return value to got_picture or negative error. CC: libav-stable@libav.org
| * matroskadec: Pad AAC extradata.Alex Converse2012-01-251-1/+1
| | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | 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>
* | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-269-261/+632
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * 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>
| * 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>
| * Add a tool for creating smooth streaming manifestsMartin Storsjö2012-01-251-1/+1
| | | | | | | | | | | | | | | | 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-254-5/+141
| | | | | | | | 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-253-11/+425
| | | | | | | | 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>
* | 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>
* | 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>
* | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-245-72/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * 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-241-0/+6
| | | | | | | | | | 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-242-2/+2
| | | | | | | | | | 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.
| * lavf: postpone removing av_close_input_file().Anton Khirnov2012-01-241-1/+1
| | | | | | | | It has been deprecated only recently.
* | Allow user to force reading mov alias from absolute path.Carl Eugen Hoyos2012-01-242-2/+22
| | | | | | | | | | | | Based on a work-around by Alex Zhukov. Fixes ticket #935
* | Merge remote-tracking branch 'tjoppen/mxf_fixes_20120124'Michael Niedermayer2012-01-241-3/+42
|\ \ | | | | | | | | | | | | | | | | | | | | | * tjoppen/mxf_fixes_20120124: mxfdec: Fix files > 2 GiB mxfdec: Handle small EditUnitByteCount Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mxfdec: Fix files > 2 GiBTomas Härdin2012-01-241-1/+1
| | | | | | | | | | | | | | | Accumulating into an int would cause overflow for files with essence containers larger than 2 GiB.
| * | mxfdec: Handle small EditUnitByteCountTomas Härdin2012-01-241-2/+41
| | | | | | | | | | | | | | | These are common with audio atoms. Without this the demuxer would read two bytes at a time for a mono 16-bit file.
* | | Added clockwise rotate values to metadata for 90 and 270 degreesPiotr Tomasik2012-01-241-0/+11
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-17 02:17:29 +0000