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-12-12adpcm: fix off by 1 error and out of array access in DK4Michael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'Michael Niedermayer
* commit '594d4d5df3c70404168701dd5c90b7e6e5587793': lavc: add a wrapper for AVCodecContext.get_buffer(). Conflicts: libavcodec/4xm.c libavcodec/8svx.c libavcodec/bmv.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/kmvc.c libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/pcx.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/rl2.c libavcodec/snow.c libavcodec/targa.c libavcodec/tscc.c libavcodec/txd.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vb.c libavcodec/vmdav.c libavcodec/vp56.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05lavc: add a wrapper for AVCodecContext.get_buffer().Anton Khirnov
It will be useful in the upcoming transition to refcounted AVFrames.
2012-11-30adpcm/thp: cosmetics: reindentPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-27AFC demuxerPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-26adpcm: thp, afc: support multichannel decodingPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-26adpcm/thp: make use of ADPCMChannelStatus to store prev samplesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-24adpcmdec: Fix OOM/infloopMichael Niedermayer
Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24ADPCM IMA Dialogic decoderPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-22ADPCM AFC decoderPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-12adpcm: reindent after previous commitPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-12adpcm: ADPCM IMA SMJPEG stereo decodingPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-07adpcm: improve smjpeg decodingPaul B Mahol
Previous version had significant artifacts. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-10Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'Michael Niedermayer
* commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f': adxdec: use planar sample format adpcmdec: use planar sample format for adpcm_thp adpcmdec: use planar sample format for adpcm_ea_xas adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3 adpcmdec: use planar sample format for adpcm_xa adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3 adpcmdec: use planar sample format for adpcm_4xm adpcmdec: use planar sample format for adpcm_ima_wav adpcmdec: use planar sample format for adpcm_ima_qt pcmdec: use planar sample format for pcm_lxf mace: use planar sample format atrac1: use planar sample format build: non-x86: Only compile mpegvideo optimizations when necessary rtpdec_mpeg4: au_headers is a single array, simple av_free is enough avcodec: free extended_data instead address of it fate: Add tests of the ff_make_absolute_url function url: Handle relative urls starting with two slashes url: Handle relative urls being just a new query string url: Don't treat slashes in query parameters as directory separators Conflicts: libavcodec/adxdec.c libavcodec/mips/Makefile libavcodec/pcm.c libavcodec/utils.c libavformat/Makefile libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-09adpcmdec: use planar sample format for adpcm_thpJustin Ruggles
2012-10-09adpcmdec: use planar sample format for adpcm_ea_xasJustin Ruggles
2012-10-09adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3Justin Ruggles
2012-10-09adpcmdec: use planar sample format for adpcm_xaJustin Ruggles
2012-10-09adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3Justin Ruggles
2012-10-09adpcmdec: use planar sample format for adpcm_4xmJustin Ruggles
2012-10-09adpcmdec: use planar sample format for adpcm_ima_wavJustin Ruggles
2012-10-09adpcmdec: use planar sample format for adpcm_ima_qtJustin Ruggles
2012-10-02Merge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'Michael Niedermayer
* commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0': adpcmdec: set AVCodec.sample_fmts twinvq: use planar sample format ralf: use planar sample format mpc7/8: use planar sample format iac/imc: use planar sample format dcadec: use float planar sample format cook: use planar sample format atrac3: use float planar sample format apedec: output in planar sample format 8svx: use planar sample format Conflicts: libavcodec/8svx.c libavcodec/dcadec.c libavcodec/mpc7.c libavcodec/mpc8.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-01adpcmdec: set AVCodec.sample_fmtsJustin Ruggles
2012-10-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-01avcodec: Drop some silly commented-out av_log() invocationsDiego Biurrun
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-05-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avplay: use libavresample for sample format conversion and channel mixing Fix compilation with YASM/NASM without AVX support. WMAL: do not output last frame again if nothing was decoded in current packet WMAL: do not start decoding if frame does not end in current packet adpcm-thp: fix invalid array indexing ppc: add const where needed in scalarproduct_int16_altivec() ppc: remove shift parameter from scalarproduct_int16_altivec() ppc: dsputil: do unaligned block accesses correctly dvenc: do not call dsputil functions with stride not a multiple of 16 APIchanges: fill in some dates and commit hashes Conflicts: doc/APIchanges ffplay.c libavcodec/adpcm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-01adpcm-thp: fix invalid array indexingMans Rullgard
Indexing outside array limits is invalid and breaks with gcc 4.8. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-03-27westwood_vqa: fix SND0 chunk handlingPaul B Mahol
Version from vqa header does not dictate which sound chunks may appear in file. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-03-21westwood_vqa: fix SND0 chunk handlingPaul B Mahol
Version from vqa header does not dictate which sound chunks may appear in file. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (35 commits) fix space type in Changelog ZeroCodec Decoder RealAudio Lossless decoder rtpenc: Use AVFormatContext.packet_size instead of a private option url: Document the expected behaviour of url_read libavformat: Use AVFormatContext.probesize in init_input docs: Fix a stray reference to tags in the generic doxy on dicts cosmetics: Align some AVInput/OutputFormat declarations zmbv: check decompress result zmbv: correct indentation adpcm: convert adpcm_thp to bytestream2. adpcm: convert adpcm_yamaha to bytestream2. adpcm: convert adpcm_swf to bytestream2. adpcm: convert adpcm_sbpro to bytestream2. adpcm: convert adpcm_ct to bytestream2. adpcm: convert adpcm_ima_amv/smjpeg to bytestream2. adpcm: convert adpcm_ea_xas to bytestream2. adpcm: convert adpcm_ea_r1/2/3 to bytestream2. adpcm: convert ea_maxis_xa to bytestream2. adpcm: convert adpcm_ea to bytestream2. ... Conflicts: Changelog libavcodec/Makefile libavcodec/adpcm.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavcodec/zerocodec.c libavcodec/zmbv.c libavformat/riff.c libavformat/url.h tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-19adpcm: convert adpcm_thp to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_yamaha to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_swf to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_sbpro to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_ct to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_ea_xas to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_ea_r1/2/3 to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert ea_maxis_xa to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_ea to bytestream2.Ronald S. Bultje
2012-03-19adpcm convert adpcm_ima_ea_sead to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_ima_ea_eacs to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_xa to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert ima_ws to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_ima_apc to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_ima_iss to bytestream2.Ronald S. Bultje
2012-03-19adpcm: convert adpcm_dk3 to bytestream2.Ronald S. Bultje