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-06-03mace: check channel count, fixes FPEMichael Niedermayer
Fixes ticket1391 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rtpdec_asf: Set the no_resync_search option for the chained asf demuxer asfdec: Add an option for not searching for the packet markers cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others cosmetics: Align codec declarations cosmetics: Convert mimic.c to utf-8 avconv: remove an unused function parameter. avconv: remove now pointless variables. avconv: drop support for building without libavfilter. nellymoserenc: fix crash due to memsetting the wrong area. libavformat: Only require first packet to be known for audio/video streams avplay: Don't try to scale timestamps if the tb isn't set Conflicts: Changelog configure ffmpeg.c libavcodec/aacenc.c libavcodec/bmpenc.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/ffv1.c libavcodec/flacenc.c libavcodec/fraps.c libavcodec/huffyuv.c libavcodec/libopenjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/pamenc.c libavcodec/pgssubdec.c libavcodec/pngenc.c libavcodec/qtrleenc.c libavcodec/rawdec.c libavcodec/sgienc.c libavcodec/tiffenc.c libavcodec/v210dec.c libavcodec/wmv2dec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-06cosmetics: Align codec declarationsMartin Storsjö
Also break some long lines, remove codec function placeholder comments and add spaces in sample/pixel format lists. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-01-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28cosmetics: Remove extra newlines at EOFAlex Converse
2011-12-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aac_latm: reconfigure decoder on audio specific config changes latmdec: fix audio specific config parsing Add avcodec_decode_audio4(). avcodec: change number of plane pointers from 4 to 8 at next major bump. Update developers documentation with coding conventions. svq1dec: avoid undefined get_bits(0) call ARM: h264dsp_neon cosmetics ARM: make some NEON macros reusable Do not memcpy raw video frames when using null muxer fate: update asf seektest vp8: flush buffers on size changes. doc: improve general documentation for MacOSX asf: use packet dts as approximation of pts asf: do not call av_read_frame rtsp: Initialize the media_type_mask in the rtp guessing demuxer Cleaned up alacenc.c Conflicts: doc/APIchanges doc/developer.texi libavcodec/8svx.c libavcodec/aacdec.c libavcodec/ac3dec.c libavcodec/avcodec.h libavcodec/nellymoserdec.c libavcodec/tta.c libavcodec/utils.c libavcodec/version.h libavcodec/wmadec.c libavformat/asfdec.c tests/ref/seek/lavf_asf Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-03Add avcodec_decode_audio4().Justin Ruggles
Deprecate avcodec_decode_audio3(). Implement audio support in avcodec_default_get_buffer(). Implement the new audio decoder API in all audio decoders.
2011-11-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: tls: Use ERR_get_error() in do_tls_poll indeo3: Fix a fencepost error. mxfdec: Fix comparison of unsigned expression < 0. mpegts: set stream id on just created stream, not an unrelated variable ra288: return error if input buffer is too small ra288: utilize DSPContext.vector_fmul() ra288: use memcpy() to copy decoded samples to output mace: only calculate output buffer size once Remove redundant filename self-references inside files. indeo3data: add missing config.h #include for HAVE_BIGENDIAN x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory avplay: reset rdft when closing stream. doc/git-howto: expand format-patch and send-email notes. lavf: expand doxy for some AVFormatContext fields. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-08mace: only calculate output buffer size onceJustin Ruggles
2011-11-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-02Replace ffmpeg references with more accurate libav* references.Diego Biurrun
2011-07-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata. H.264: tweak some other x86 asm for Atom probe: Fix insane flow control. mpegts: remove invalid error check s302m: use nondeprecated audio sample format API lavc: use designated initialisers for all codecs. x86: cabac: add operand size suffixes missing from 6c32576 Conflicts: libavcodec/ac3enc_float.c libavcodec/flacenc.c libavcodec/frwu.c libavcodec/pictordec.c libavcodec/qtrleenc.c libavcodec/v210enc.c libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-29lavc: use designated initialisers for all codecs.Anton Khirnov
It's more readable and less prone to breakage.
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-28Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò
None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
2011-01-26Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò
None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
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-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
2010-03-31Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini
is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes anThilo Borgmann
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows passing of packet-specific flags from demuxer to decoder, such as the keyframe flag, which appears necessary to playback corePNG P-frames. Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread "Google Summer of Code participation" on the mailinglist. Originally committed as revision 18351 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
2008-10-06Cosmetics: rename mace3_decode_frame() to mace_decode_frame()Vitor Sessak
Originally committed as revision 15569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-06Avoid code duplication between mace3_decode_frame() and mace6_decode_frame()Vitor Sessak
Originally committed as revision 15568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05Use a for() instead of triplicating code.Vitor Sessak
Originally committed as revision 15566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05Factorize duplicate table reading code.Vitor Sessak
Originally committed as revision 15564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09Convert two tables to signed decimalVitor Sessak
Originally committed as revision 15290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09Cosmetics: remove useless parenthesesVitor Sessak
Originally committed as revision 15288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09Remove ChannelData.lev var and use ChannelData.level insteadVitor Sessak
Originally committed as revision 15287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08Check output buffer size before decoding.Vitor Sessak
Originally committed as revision 15257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08Cosmetics: rename vars s/ctx/chd/Vitor Sessak
Originally committed as revision 15256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Exploit symmetry to reduce size of tables by half.Vitor Sessak
Originally committed as revision 15255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Cosmetics: s/short/int16_t/Vitor Sessak
Originally committed as revision 15253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Remove cast, now tables are signed.Vitor Sessak
Originally committed as revision 15252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Convert tables to signed and decimal.Vitor Sessak
Originally committed as revision 15251 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Remove unused table entries.Vitor Sessak
Originally committed as revision 15250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Remove commented out code.Vitor Sessak
Originally committed as revision 15249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Use FFMIN() instead of rewriting it.Vitor Sessak
Originally committed as revision 15248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Factorize broken clipping in its own function and document it.Vitor Sessak
Originally committed as revision 15247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Cosmetics: whitespace/linebreaksVitor Sessak
Originally committed as revision 15246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Use the same 8 bit -> 16 bit conversion as QuickTime.Vitor Sessak
Originally committed as revision 15245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Do not share context variables between channels and do not zero them atVitor Sessak
decode_frame(). This makes the output much closer to that of the binary decoder. Originally committed as revision 15244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07Remove output pointer from contextVitor Sessak
Originally committed as revision 15243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05Cosmetics: indent after last commit and remove useless bracesVitor Sessak
Originally committed as revision 15214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05Simplify: use a for instead of unrolling by handVitor Sessak
Originally committed as revision 15213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05Functions mace{3,6}_decode_frame() are just wrappers to Exp1to{3,6}(). This ↵Vitor Sessak
commit moves the code of Exp1to* to the decode functions. Originally committed as revision 15212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05Simplify: use two distinct functions to decode MACE3 and MACE6, since theVitor Sessak
previous mace_decode_init() function was almost just a switch statement. Originally committed as revision 15208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05Simplify mace_decode_frame()Vitor Sessak
Originally committed as revision 15207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05Remove useless commentsVitor Sessak
Originally committed as revision 15205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05Reindent mace.c, its indentation was completly inconsistent with the coding ↵Vitor Sessak
rules. Originally committed as revision 15204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31Modify all codecs to report their supported input and output sample format(s).Peter Ross
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk