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-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-04-06cosmetics: Convert mimic.c to utf-8Martin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
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-17mimic: don't use self as reference, and report completion at end of decode().Ronald S. Bultje
Fixes hangs on corrupt samples that reference self-frames. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2012-03-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: pcm-mpeg: convert to bytestream2 API Revert "h264: clear trailing bits in partially parsed NAL units" remove iwmmxt optimizations mimic: do not continue if swap_buf_size is 0 mimic: convert to bytestream2 API frwu: use MKTAG to check marker instead of AV_RL32 txd: port to bytestream2 API c93: convert to bytestream2 API iff: make .long_name more descriptive FATE: add test for cdxl demuxer rtsp: Fix a typo Conflicts: libavcodec/arm/dsputil_iwmmxt.c libavcodec/arm/dsputil_iwmmxt_rnd_template.c libavcodec/arm/mpegvideo_iwmmxt.c libavcodec/c93.c libavcodec/txd.c libavutil/arm/cpu.c tests/fate/demux.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-12mimic: do not continue if swap_buf_size is 0Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-03-12mimic: convert to bytestream2 APIPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-02-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-16dsputil: Add ff_ prefix to the dsputil*_init* functionsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-02-16vlc/rl: Add ff_ prefix to the nonstatic symbolsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-01-19Use av_fast_padded_malloc in mimic and truemotion2 decoders.Reimar Döffinger
Fixes use of uninitialized data errors under valgrind. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: swscale: Fix stack alignment for SSE avcodec: move some AVCodecContext fields to an internal struct. avcodec: use av_opt_set() instead of deprecated av_set_string3() avcodec: fix some const warnings avcodec: remove pointless AVOption, internal_buffer_count imgutils: Fix illegal read. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19avcodec: move some AVCodecContext fields to an internal struct.Justin Ruggles
A new field, AVCodecContext.internal is used to hold a new struct AVCodecInternal, which has private fields that are not codec-specific and are used by general libavcodec functions. Moved internal_buffer, internal_buffer_count, and is_copy.
2011-11-06Try to set AVFrame.reference to correct values.Reimar Döffinger
I am not sure these new values are correct, not am I sure the semantics are a good idea since we do not seem to make any use of them but they caused a lot of confusion, but this seems to make things closer to matching the documentation. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
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-05-02replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini
2011-05-02Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-04-1810l, commit that should have been stashed into the merge.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-18Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. make av_dup_packet() more cautious on allocation failures make containers pass palette change in AVPacket introduce side information for AVPacket Politic commits that have not been pulled: Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-17Replace more FFmpeg references by Libav.Diego Biurrun
2011-03-29mimic: implement multithreading.Alexander Strange
2011-03-23Fake-Merge remote-tracking branch 'ffmpeg-mt/master'Michael Niedermayer
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17Remove occurrences of my old email addressRamiro Polla
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-16Remove occurrences of my old email address.Ramiro Polla
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-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
2010-03-06Remove DECLARE_ALIGNED_{8,16} macrosMåns Rullgård
These macros are redundant. All uses are replaced with the generic DECLARE_ALIGNED macro instead. Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22Move array specifiers outside DECLARE_ALIGNED() invocationsMåns Rullgård
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13Rename bitstream.h to get_bits.h.Stefano Sabatini
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12Add a av_fast_malloc function and replace several uses of av_fast_realloc,Reimar Döffinger
thus avoiding potential memleaks and pointless memcpys. Originally committed as revision 18470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12Use void * instead of uint8_t * for the destination buffer for dsp.bswap_bufReimar Döffinger
where easily possible (mimic, eatqi, 4xm). This allows to avoid a typecast. Originally committed as revision 18469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12Use AVERROR(ENOMEM) instead of AVERROR_NOMEM / -1 in eatqi and mimic decodersReimar Döffinger
Originally committed as revision 18467 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-17cosmetics: 'const static' --> 'static const' to avoid warnings of the typeDiego Biurrun
"'static' is not at beginning of declaration" with -Wextra. Originally committed as revision 17391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11clear_block mmxLoren Merritt
Originally committed as revision 16045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-22uses FF_ARRAY_ELEMS() where appropriateAurelien Jacobs
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13Make AVCodec long_names definition conditional depending on CONFIG_SMALL.Stefano Sabatini
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27Add long names to many AVCodec declarations.Stefano Sabatini
patch by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26get_vlc2() only gets up to three levels in the tables. The last codes ↵Ramiro Polla
weren't being read properly. Originally committed as revision 12976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-23Fix regression introduced by r12929.Ramiro Polla
num_coeffs is just one byte. It would make no sense for num_coeffs to be as high as 2^32. Originally committed as revision 12931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-23The code now is pretty self explanatory about the header structure.Ramiro Polla
Remove the big comment and add comments about the skipped fields. Originally committed as revision 12930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-23Use bytestream functions for reading frame header.Ramiro Polla
Originally committed as revision 12929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19Do not pass dct_block to vlc_decode_block().Ramiro Polla
The function uses dct_block from the context anyways. Originally committed as revision 12908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19Cosmetics and style.Ramiro Polla
Originally committed as revision 12907 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19Rename vlc1 to vlc.Ramiro Polla
There is no vlc2, so there is no point in numbering it. Originally committed as revision 12906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21Apply 'cold' attribute to init/uninit functions in libavcodecZuxy Meng
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk