Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-03-18Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: resample: allocate a large enough output buffer fate: fix enc_dec_pcm tests with remote target wmaenc: remove bit-exact hack FATE: remove WMA acodec tests FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison qtrle: Use bytestream2 functions to prevent buffer overreads. vqavideo: check malloc return values x11grab: fix a memory leak exposed by valgrind threads: fix old frames returned after avcodec_flush_buffers() MPV: always mark dummy frames as reference h264: fix deadlocks on incomplete reference frame decoding. mpeg4: report frame decoding completion at ff_MPV_frame_end(). mimic: don't use self as reference, and report completion at end of decode(). Conflicts: libavcodec/h264.c libavcodec/qtrle.c libavcodec/resample.c libavcodec/vqavideo.c libavdevice/x11grab.c tests/ref/seek/wmav1_asf tests/ref/seek/wmav2_asf Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-17resample: allocate a large enough output bufferJustin Ruggles
Fixes invalid writes and crashes when doing conversions such as stereo to 5.1 channels or sample rate conversion on 5.1 channels.
2011-10-27resample: Fix array sizeMichael Niedermayer
Found-by: Jim Radford Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (22 commits) g722dec: check output buffer size before decoding g722dec: cosmetics: reindent/linewrap g722dec: remove the use of lowres for half-rate decoding. tta: check for extradata allocation failure in tta demuxer tta: check for allocation failure of decode_buffer tta: use correct frame_length calculation. tta: add support for decoding 24-bit sample format cosmetics: indentation tta: remove pointless braces tta: check output buffer size after adjusting frame length for last frame tta: fix reading of format in TTA header. tta: remove useless commented-out lines tta: check remaining bitstream size while reading unary value lavf: deprecate AVStream.stream_copy avconc: split choose_codec() to choose_decoder/choose_encoder. lavf: simplify by using FFMAX/FFMIN. mpegenc: add preload private option. cosmetics: simplify latm_decode_init latm: avoid unnecessary reinit of the aac decoder aacdec: initialize sbr context only in new channel elements ... Conflicts: avconv.c libavcodec/resample.c libavcodec/tta.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-25resample: reject unhandled conversionsJanne Grunau
audio_resample can not reduce the number of channels
2011-10-25resample: remove unused #defineJanne Grunau
2011-09-01resample: fix typo (ouput → output).Clément Bœsch
2011-09-01resample: fix set but unused variable (lfe) warning.Clément Bœsch
2011-06-21Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-21Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().Justin Ruggles
av_get_bits_per_sample_fmt() is deprecated.
2011-06-11resample: clarify supported resampling.Clément Bœsch
This also fix a crash on 8ch → 2ch requested resampling.
2011-05-23add 5.1 to stereo downmix to resample.cjan gerber
this is based on previous 6to2channel-resample.patch from ffmpeg2theora but updated to work with trunk and using av_clip_int16.
2011-05-12Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: (32 commits) 10-bit H.264 x86 chroma v loopfilter asm Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected] Fix crash of interlaced MPEG2 decoding h264pred: fix one more aliasing violation. doc/APIchanges: fill in missing hashes and dates. flacenc: use proper initializers for AVOption default values. lavc: deprecate named constants for deprecated antialias_algo. aac: workaround for compilation on cygwin swscale: extend YUV422p support to 10bits depth tiff: add support for inverted FillOrder for uncompressed data Remove unused softfloat implementation. h264pred: fix aliasing violations. rotozoom: Eliminate French variable name. rotozoom: Check return value of fread(). rotozoom: Return an error value instead of calling exit(). rotozoom: Make init_demo() return int and check for errors on invocation. rotozoom: Drop silly UINT8 typedef. rotozoom: Drop some unnecessary parentheses. rotozoom: K&R coding style cosmetics rtsp: Only do keepalive using GET_PARAMETER if the server supports it ... Conflicts: Changelog cmdutils.c doc/APIchanges doc/general.texi ffmpeg.c ffplay.c libavcodec/h264pred_template.c libavcodec/resample.c libavutil/pixfmt.h libavutil/softfloat.c libavutil/softfloat.h tests/rotozoom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-11cosmetics: Fix crazy formatting in resample.Alex Converse
2011-05-11Allow resampling with no channel count change for up to 8 channels.Alex Converse
2011-05-11Don't allow unsupported resampling configurations.Alex Converse
2011-04-20Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-19lavc: remove the FF_API_AUDIO_OLD cruft.Anton Khirnov
2011-04-09Fix ticket21, temporary audio array was too small.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-17Merge libavcore into libavutilReinhard Tartler
Done to keep ABI compatible. Otherwise this is just silly
2011-02-15Merge libavcore into libavutilReinhard Tartler
It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2010-11-12Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini
SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-03Remove usage of deprecated libavcodec/audioconvert.h functions.Stefano Sabatini
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-30add FF_API_AUDIO_OLD define to disable the deprecated decode_audio APIAurelien Jacobs
Originally committed as revision 25270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26Move AVOptions from libavcodec to libavutilMichael Niedermayer
Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-29Add version to AVClass so we can add to and use fields of AVClass without ↵Michael Niedermayer
ABI issues. Originally committed as revision 22987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20Remove explicit filename from Doxygen @file commands.Diego Biurrun
Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11Add const in cast. Removes warning:Baptiste Coudurier
libavcodec/resample.c:215: warning: assignment discards qualifiers from pointer target type Originally committed as revision 19151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11give s->resample_context to avoid segfault, avclass was movedBaptiste Coudurier
Originally committed as revision 19150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-23Move av_class to AVResampleContext instead of ReSampleContext.Benoit Fouet
Fixes issue 852. Originally committed as revision 18170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15Prevent heap corruption when resampling 8-bit audio.Peter Ross
Originally committed as revision 17311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12extend resampling API, add S16 internal conversionBaptiste Coudurier
Originally committed as revision 17163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01Use full internal pathname in doxygen @file directives.Diego Biurrun
Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03cosmetics: make all references to AC-3 capitalized and hyphenatedJustin Ruggles
Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-15Add missing '\n' to log format textAndreas Öman
Originally committed as revision 11224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01senseless cast and ()Michael Niedermayer
Originally committed as revision 11118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01stupid code (casting of void*) found by checktree.shMichael Niedermayer
Originally committed as revision 11117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-07make output buffer larger so drift compensation can workMichael Niedermayer
Originally committed as revision 9967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-17typo fixesDiego Biurrun
Originally committed as revision 9719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-22set more reasonable cutoff for audio rate conversionMichael Niedermayer
Originally committed as revision 8486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun
and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-13Update licensing information: The FSF changed postal address.Diego Biurrun
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22COSMETICS: tabs --> spaces, some prettyprintingDiego Biurrun
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17COSMETICS: Remove all trailing whitespace.Diego Biurrun
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24kill warnings patch by (Måns Rullgård <mru inprovide com>)Måns Rullgård
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-22user selectble cutoff frequencyMichael Niedermayer
Originally committed as revision 3619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-21make most resample filter parameters selectable at runtimeMichael Niedermayer
Originally committed as revision 3617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-30various resampling fixesMichael Niedermayer
Originally committed as revision 3271 to svn://svn.ffmpeg.org/ffmpeg/trunk