aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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.
| * | avplay: remove the -er option.Anton Khirnov2012-01-241-3/+0
| | | | | | | | | | | | Error recognition flags can and should be set directly with AVOptions.
| * | lavd: remove deprecated v4l grab device.Anton Khirnov2012-01-245-376/+0
| | |
| * | Changelog: restore version <next> headerPaul B Mahol2012-01-241-1/+4
| | | | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | rv10: verify slice offsets against buffer sizeJanne Grunau2012-01-241-1/+8
| | | | | | | | | | | | Found by John Villamil <johnv@matasano.com> in fuzzed rv20 in mkv files.
* | | 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
* | | error concealment: initialize block index.Michael Niedermayer2012-01-241-0/+3
| | | | | | | | | | | | | | | | | | | | | Fixes CVE-2011-3941 (out of bounds write) Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | 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>
* | | | lavf: replace remaining use of deprecated get_strz()Paul B Mahol2012-01-242-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | sws: Fix RGB0->alpha containing formats.Michael Niedermayer2012-01-243-7/+40
| | | | | | | | | | | | | | | | | | | | | | | | Fixes Ticket869 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | buildsys: Fix shared lib build of ffserver.Michael Niedermayer2012-01-242-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | build: Allow building old API/ABI libpostproc versionAlexander Strasser2012-01-242-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows our users to still build against a libpostproc with the old API/ABI. Distributions can use this option to defer the soname bump. Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | doc: add Timecode documentation.Clément Bœsch2012-01-243-1/+36
| | | |
* | | | maintainers: add myself for recent works.Nicolas George2012-01-241-0/+10
| | | |
* | | | faq: fix typo.Nicolas George2012-01-241-1/+1
| | | | | | | | | | | | | | | | Reported-By: Clément Bœsch
* | | | faq: document af_aconvert quirks using lavfi.Nicolas George2012-01-241-0/+18
| | | |
* | | | Add myself as mxfdec maintainerTomas Härdin2012-01-241-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | h264: Disallow w/h/pixfmt changes for frame threads.Michael Niedermayer2012-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this was just checked in case of slice threads, but frame threads do not support this either currently. Making them support this is of course the long term goal Fixes bug155 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | mpegvideo: Draw edges based on the pictures linesize instead of the contexts.Michael Niedermayer2012-01-241-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | ffmpeg: Allocate buffers of the size needed by the decoder.Michael Niedermayer2012-01-241-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug127 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | libcelt: configure: distinguish not found and too old.Nicolas George2012-01-241-1/+3
| | | | | | | | | | | | | | | | Fixes ticket #940.
* | | | lavfi: require libswr for af_pan.Nicolas George2012-01-241-0/+1
| | | |
* | | | lavd/lavfi: add dumpgraph option.Nicolas George2012-01-242-0/+10
| | | |
* | | | lavfi: add avfilter_graph_dump.Nicolas George2012-01-245-2/+186
| | | |
* | | | pan: drop unecessary includes.Clément Bœsch2012-01-241-2/+0
| | | |
* | | | pan: move query_formats() to avoid forward declarations.Clément Bœsch2012-01-241-37/+34
| | | |
* | | | pan: reindent after remap commit.Clément Bœsch2012-01-241-21/+21
| | | |
* | | | pan: add channel mapping capability.Clément Bœsch2012-01-244-7/+174
| | | |
* | | | pan: raise correct error when there is no param specified.Clément Bœsch2012-01-241-0/+6
|/ / /
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-2420-342/+1027
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Remove ffmpeg. aacenc: Simplify windowing aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples. aacenc: Deinterleave input samples before processing. aacenc: Store channel count in AACEncContext. aacenc: Move Q^3/4 calculation to it's own table aacenc: Request normalized float samples instead of converting s16 samples to float. aacpsy: Replace an if with FFMAX in LAME windowing. aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated. aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons aacenc: cosmetics: move init() and end() to the bottom of the file. aacenc: aac_encode_init() cleanup XWD encoder and decoder vc1: don't read the interpfrm and bfraction elements for interlaced frames mxfdec: fix memleak on mxf_read_close() westwood: split the AUD and VQA demuxers into separate files. Conflicts: .gitignore Changelog Makefile configure doc/ffmpeg.texi ffmpeg.c libavcodec/Makefile libavcodec/aacenc.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/img2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>