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-11-19swr: set default channel count options to 0.Clément Bœsch
If not set, they will be defined using the channel layout setting, which is much more convenient when using swr_alloc() instead of swr_alloc_set_opts().
2012-11-16swr/resample: fix SSSE3 included unconditionally.Clément Bœsch
10l Regression since 8ea88339.
2012-11-16swr/rematrix: move templating parameters to template itself.Clément Bœsch
2012-11-16swr/resample: move templating parameters to template itself.Clément Bœsch
It has various benefits such as allowing some refactoring, clarifying the code in the inclusion part, and making the template understandable in standalone. This commit is based on the templating method used by Justin Ruggles for libavresample.
2012-11-15swr: move if() block into the only branch where it can be true.Michael Niedermayer
This should make the code a tiny tiny bit faster. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15swr: reorder/redesign operations to avoid integer overflow.Michael Niedermayer
This fixes a out of array read. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.hPaul B Mahol
Also remove it in once case when it is not needed. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-03lswr/swresample: adopt globally consistent rules for options help messageStefano Sabatini
The help text tells what the option does, not what the accepted parameter is. Thus convert strings of the kind: Bikeshed Color to set bikeshed color
2012-11-03lswr/swresample.h: use consistent inclusion guard header nameStefano Sabatini
2012-10-31Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'Michael Niedermayer
* commit '6860b4081d046558c44b1b42f22022ea341a2a73': x86: include x86inc.asm in x86util.asm cng: Reindent some incorrectly indented lines cngdec: Allow flushing the decoder cngdec: Make the dbov variable have the right unit cngdec: Fix the memset size to cover the full array cngdec: Update the LPC coefficients after averaging the reflection coefficients configure: fix print_config() with broke awks Conflicts: libavcodec/x86/ac3dsp.asm libavcodec/x86/dct32.asm libavcodec/x86/deinterlace.asm libavcodec/x86/dsputil.asm libavcodec/x86/dsputilenc.asm libavcodec/x86/fft.asm libavcodec/x86/fmtconvert.asm libavcodec/x86/h264_chromamc.asm libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264_idct.asm libavcodec/x86/h264_idct_10bit.asm libavcodec/x86/h264_intrapred.asm libavcodec/x86/h264_intrapred_10bit.asm libavcodec/x86/h264_weight.asm libavcodec/x86/vc1dsp.asm libavcodec/x86/vp3dsp.asm libavcodec/x86/vp56dsp.asm libavcodec/x86/vp8dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-28swr: use 64bit index/len for x86_64 mixMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20swresample: include ff_log2_tab for shared buildsHendrik Leppkes
This is done in accordance with all other libraries, which no longer access ff_log2_tab from avutil directly for shared builds, and instead obtain their own copy. This change is required for MSVC DLL builds, as well as avoids accessing a private symbol from another library. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16swr-test: fix division by 0Michael Niedermayer
Fixes CID733739 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16swr-test: check pointers before useMichael Niedermayer
Fixes: CID733807, CID733806 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-14swr/rematrix: fix C99 left shift overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11swri_resample_init: unsupported sample formats are an internal error.Michael Niedermayer
This condition cannot happen. Fixes CID733802 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06swr-test: avoid VLAMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-28Add missing version macros to librariesjamal
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-28swresample: Create version.h headerjamal
Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25ARM: libswresample: NEON optimised generic fltp to s16 conversionMans Rullgard
Adapted to swr by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25swr: make sure the last data element is NULL so we can use it to detect the ↵Michael Niedermayer
number of channels Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25ARM: libswresample: NEON optimised stereo fltp to s16 conversionMans Rullgard
Adaption to swr by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25ARM: libswresample: NEON optimised flat float to s16 conversionMans Rullgard
Adapted to swr by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13swr/resample: mark mm_flags as potentially unusedMichael Niedermayer
They are unused when asm is disabled Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09swr: add av_cold to init/free functionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-08swr/auto_matrix: treat a single channel as mono instead of failingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-08swr/auto_matrix: treat stereo downmix like stereo.Michael Niedermayer
Based on code by John Stebbins Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-08swr/auto_matrix: add clean layout functionMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-08swr/auto_matrix: move layouts to local variablesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-08libswr: remove redundant ARCH_X86, MMX* implicates X86Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-08swsresample: Fix unprotected inline asmDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07Add Dolby/DPLII downmix support to libswresampleMichael Niedermayer
Based on code by John Stebbins <jstebbins.hb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07swr: update rematrix coeffs to match AC-3Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07swr: update copyright yearsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'Michael Niedermayer
* commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078': avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member Conflicts: libavcodec/libvpxenc.c libavcodec/options_table.h libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer
* commit '124134e42455763b28cc346fed1d07017a76e84e': avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member Conflicts: libavcodec/aacenc.c libavcodec/libopenjpegenc.c libavcodec/options_table.h libavdevice/bktr.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/vf_drawtext.c libavformat/movenc.c libavformat/options_table.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-01Fix compilation with yasm-0.6.2.Carl Eugen Hoyos
2012-09-01swr/resample: update SSSE3 flag to new nameMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-31Add some missing _EXTERNAL suffixes to yasm source files.Carl Eugen Hoyos
2012-08-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: utvideodec: Fix single symbol mode decoding truespeech: drop useless casts libavcodec: drop bogus dependencies from mpc[78] and qdm2 mpegaudio: move ff_mpa_enwindow to a separate file AVOptions: store defaults for INT64 options in int64 union member. Conflicts: libavcodec/Makefile libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mpegvideo: reduce excessive inlining of mpeg_motion() mpegvideo: convert mpegvideo_common.h to a .c file build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO Move MASK_ABS macro to libavcodec/mathops.h x86: move MANGLE() and related macros to libavutil/x86/asm.h x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h aacdec: Don't fall back to the old output configuration when no old configuration is present. rtmp: Add message tracking rtsp: Support mpegts in raw udp packets rtsp: Support receiving plain data over UDP without any RTP encapsulation rtpdec: Remove an unused include rtpenc: Remove an av_abort() that depends on user-supplied data vsrc_movie: discourage its use with avconv. avconv: allow no input files. avconv: prevent invalid reads in transcode_init() avconv: rename OutputStream.is_past_recording_time to finished. Conflicts: configure doc/filters.texi ffmpeg.c ffmpeg.h libavcodec/Makefile libavcodec/aacdec.c libavcodec/mpegvideo.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-09bessel: check that the function terminates as expected by av_assert2().Michael Niedermayer
A clear abort is better than wrong output and a possible crash. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-01swr: fix 10l typo mixing in and out config.Michael Niedermayer
Fixes ticket1458 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-23swr: resampling: add filter type and Kaiser window beta to AVOptionsJustin Ruggles
2012-07-17lswr: channel_map requires input conversion.Nicolas George
channel_map is applied between in and postin. Without this test, if the input format is an acceptable internal format, the in->postin conversion is skipped. In the best case, it ignores channel_map, in the worst case it causes an assert failure if the number of channels is changed by the map.
2012-07-07swr/x86: 16bit integer mix functions need SSE2 not SSEMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-07lavu: 256 color supportPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-05swr/x86: 10l, missed some SSE2 instructions in code marked as SSE.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-02swr: fix warning: passing argument 2 of s->mix_any_f from incompatible ↵Michael Niedermayer
pointer type Signed-off-by: Michael Niedermayer <michaelni@gmx.at>