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
2015-06-01Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'Michael Niedermayer
* commit '03927cb73399e6f07185fc7f8851d7612b4187b6': psymodel: Check memory allocation Conflicts: libavcodec/psymodel.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-31psymodel: Check memory allocationVittorio Giovara
2014-10-14avcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointerMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14avcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the ↵Michael Niedermayer
pointers as well Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-14avcodec/psymodel: use av_malloc(z)_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-01Avoid a null pointer dereference on oom in the aac encoder.Carl Eugen Hoyos
Fixes ticket #2732.
2013-03-20mips: Optimization of IIR filter functionBojan Zivkovic
Signed-off-by: Bojan Zivkovic <bojan@mips.com> Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07psymodel: dont apply lowpass filters with a cutoff close to the nyquistMichael Niedermayer
The IIR filter numerically diverges in such cases, this could easily be fixed but would make the filter slower on some platforms Fixes Ticket2246 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-15Don't include common.h from avutil.hMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov
2012-07-30aacenc: new default cutoffMichael Niedermayer
Improves subjective quality Formula and testing by: kamedo2 <fujisakihir90@yahoo.co.jp> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
2012-01-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-01-23aacenc: Deinterleave input samples before processing.Nathan Caldwell
Signed-off-by: Alex Converse <alex.converse@gmail.com>
2012-01-23aacenc: Request normalized float samples instead of converting s16 samples ↵Nathan Caldwell
to float. Signed-off-by: Alex Converse <alex.converse@gmail.com>
2011-06-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rational-test: Add proper main() declaration to fix gcc warnings. configure: Add vdpau and dxva2 to configure results output. Remove unused, never built libavutil/pca.[ch] matroskadec: forward parsing errors to caller. av_find_stream_info: simplify EAGAIN handling. aacenc: Fix determination of Mid/Side Mode. psymodel: Remove the single channel analysis function aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel. psymodel: Add channels and channel groups to the psymodel. ARM: remove check for PLD instruction fate: move amr[nw]b test rules into separate files ogg: fix double free when finding length of small chained oggs. swscale: implement >8bit scaling support. build: fix creation of tools dir with make 3.81 build: Mark all-yes Makefile target as phony. pixfmt: fix YUV422/444 wrong endian comment build: create output directories as needed Add new yuv444 pixfmts to avcodec_align_dimensions2 Conflicts: Makefile configure libavutil/pca.c libavutil/pca.h libavutil/pixfmt.h libswscale/swscale.c libswscale/utils.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-30psymodel: Add channels and channel groups to the psymodel.Nathan Caldwell
2011-05-09Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: log: Fix an oob array read. cosmetics: trim trailing whitespace in postproc Ban strncpy() it's too easy to misuse. psymodel: Remove wrapper functions. aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'. regtest: remove redundant flags in jpg test regtest: use run_ffmpeg in do_image_formats regtest: simplify encoding functions ffmpeg.c: check for interlaced flag in the correct place. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08psymodel: Remove wrapper functions.Nathan Caldwell
Instead use the function pointers directly.
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21cosmetics: vertical alignment and line wrapJustin Ruggles
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 75b98610a7ce7acf34f583a04aaccd8c619947fe)
2011-01-21Add memory allocation failure checks to ff_iir_filter_init_coeffs().Justin Ruggles
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d42dc217ed2b0f886ffc50b26c2bbff1fee5feca)
2011-01-20cosmetics: vertical alignment and line wrapJustin Ruggles
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-20Add memory allocation failure checks to ff_iir_filter_init_coeffs().Justin Ruggles
Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-08-31psymodel: Const correct FFPsyWindowInfo.Alex Converse
Originally committed as revision 24999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10Fix a leak in the AAC encoderMartin Storsjö
Originally committed as revision 24159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-2910l: Revert r23867. It didn't make any sense.Alex Converse
Originally committed as revision 23868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-29Make ff_psy_preprocess_end() act like av_freep().Alex Converse
Originally committed as revision 23867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02aacenc: Don't lowpass the input unless specifically requested.Alex Converse
The heuristic for estimating a good cutoff is busted. Originally committed as revision 22779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-14Use cutoff frequency to adjust bandwidth in the generic psymodel preprocess.Alex Converse
Originally committed as revision 19429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09cosmetics: Remove unnecessary {} around if/for blocks;Diego Biurrun
move statements after if/for to the next line. Originally committed as revision 19378 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09cosmetics: prettyprinting, K&R style, break overly long linesDiego Biurrun
Originally committed as revision 19377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09Cosmetics: Pretty print the AAC encoder.Alex Converse
Originally committed as revision 19376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09Merge the AAC encoder from SoC svn. It is still considered experimental.Alex Converse
Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk