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
2016-06-29Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'Clément Bœsch
* commit 'b7f98659f21dce438c33b512e25fd64b8d07c347': Remove unnecessary get_bits.h #includes Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-07Remove unnecessary get_bits.h #includesDiego Biurrun
2015-03-20avcodec/dv: remove unused var dvquantareasMartin Vignali
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-20avcodec/dv: remove unused var dv100qstepMartin Vignali
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28dv: increase VLC reading bits to 10Christophe Gisquet
This also requires a bump in the table size of bit patterns to 1664. From 356 to 348 cycles. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26dv: move inverse weight tables to decoderChristophe Gisquet
The encoder has its own tables and does not access the idct_factor member of the DVVideoContext structure. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25dv: use smaller type for weight tablesChristophe Gisquet
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25dv: better split weight tables assignmentChristophe Gisquet
This is a mostly cosmetical patch in preparation for the following. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'Michael Niedermayer
* commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47': dv: K&R formatting cosmetics Conflicts: libavcodec/dv.c libavcodec/dv.h libavcodec/dv_profile.c libavcodec/dvdec.c libavcodec/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09dv: K&R formatting cosmeticsGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-10Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'Michael Niedermayer
* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1': lavc: export DV profile API used by muxer/demuxer as public Conflicts: configure doc/APIchanges libavcodec/Makefile libavcodec/dv_profile.c libavcodec/dv_profile.h libavcodec/version.h libavformat/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09lavc: export DV profile API used by muxer/demuxer as publicAnton Khirnov
2014-06-27Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'Michael Niedermayer
* commit 'e63b818dbe6060b606ae10eb184859f8b97d2353': dv: Properly split decoder and encoder initialization Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27dv: Properly split decoder and encoder initializationDiego Biurrun
2014-06-26Merge commit '593d2326ef985cdffe413df629419938f7b07c4c'Michael Niedermayer
* commit '593d2326ef985cdffe413df629419938f7b07c4c': dv: Replace a magic number by sizeof() Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26dv: Replace a magic number by sizeof()Diego Biurrun
2014-06-20Merge commit 'd349afb07bacccb62eb5369c38d6406d2909d792'Michael Niedermayer
* commit 'd349afb07bacccb62eb5369c38d6406d2909d792': dv: cosmetics, reindent Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'Michael Niedermayer
* commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f': dv: get rid of global non-const tables Conflicts: libavcodec/dv_profile.h libavcodec/dvdec.c libavcodec/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20dv: cosmetics, reindentAnton Khirnov
2014-06-20dv: get rid of global non-const tablesAnton Khirnov
Instead, store them in the context and compute on each parameter change.
2014-04-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: dsputil: Move DV-specific ff_zigzag248_direct table to dvdata Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04dsputil: Move DV-specific ff_zigzag248_direct table to dvdataDiego Biurrun
2013-12-09Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'Michael Niedermayer
* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8': dv: use AVFrame API properly Conflicts: libavcodec/dvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09dv: use AVFrame API properlyAnton Khirnov
2013-12-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: dv: Split off DV video encoder into its own file Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02Merge commit '21710ea82118c9d19bea9277b2a85a33096fdd95'Michael Niedermayer
* commit '21710ea82118c9d19bea9277b2a85a33096fdd95': dv: Move DV VLC data tables out of header file Conflicts: libavcodec/dv_vlc_data.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02dv: Split off DV video encoder into its own fileDiego Biurrun
2013-12-02dv: Move DV VLC data tables out of header fileDiego Biurrun
2013-11-15Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'Michael Niedermayer
* commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4': dv: Split DV data table declarations into their own header Conflicts: libavcodec/dvdata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-15dv: Split DV data table declarations into their own headerDiego Biurrun
This is necessary to avoid target config settings bleeding into the host compilation process with hardcoded tables and the DV VLC tables no longer present as static tables in a header file.
2013-10-04Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun
2013-08-12libavcodec/dv.c: Fix duplicate wordsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29Merge commit 'afe03092dd693d025d43e1620283d8d285c92772'Michael Niedermayer
* commit 'afe03092dd693d025d43e1620283d8d285c92772': lavc: move put_bits_left in put_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28lavc: move put_bits_left in put_bits.hLuca Barbato
2013-03-12Merge commit '3b199d29cd597a3518136d78860e172060b9e83d'Michael Niedermayer
* commit '3b199d29cd597a3518136d78860e172060b9e83d': lavc decoders: properly initialize AVFrame. Conflicts: libavcodec/avs.c libavcodec/c93.c libavcodec/cinepak.c libavcodec/flashsv.c libavcodec/flicvideo.c libavcodec/iff.c libavcodec/mmvideo.c libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/qtrle.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/tiertexseqv.c libavcodec/truemotion1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08lavc decoders: properly initialize AVFrame.Anton Khirnov
2013-02-26Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'Michael Niedermayer
* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-26Remove unnecessary dsputil.h #includesDiego Biurrun
2013-02-09Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'Michael Niedermayer
* commit '218aefce4472dc02ee3f12830a9a894bf7916da9': dsputil: Move LOCAL_ALIGNED macros to libavutil Conflicts: libavcodec/dvdec.c libavcodec/imc.c libavcodec/mpegvideo_motion.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09dsputil: Move LOCAL_ALIGNED macros to libavutilDiego Biurrun
2013-01-23Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Drop DCTELEM typedefDiego Biurrun
It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-11-23dv: use av_assertMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-18dv: change assert(a2 < 4) to av_assert()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15dv: Set FS flag from AVFrame.top_field_firstTomas Härdin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12dv: zero dsp before init, this fixes use of uninitialized dct_bitsMichael Niedermayer
Fixes CID732292 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer
* commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov
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>