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-10-20Replace usage of the deprecated av_pix_fmt_descriptors array with ↵Hendrik Leppkes
av_pix_fmt_desc_get 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-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 '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-08-09Remove "Error parsing options string [...]" messages.Clément Bœsch
This reduces from 3 to 2 messages for the same syntax error in ffprobe, and from 4 to 3 in filters.
2012-07-15lavfi: decrease logging level of message showing initial parametersStefano Sabatini
Reduce log clutter, consistent with 1a49a169eb74a97.
2012-07-08lavfi: do not pass opaque field to init functionsStefano Sabatini
Fix signature mismatch warnings.
2012-06-23lavfi: define macro AVFILTER_DEFINE_CLASSStefano Sabatini
The macro can be used to define consistently the internal class of a filter, save some typing and factorize.
2012-06-21lavfi: remove redundant checks after av_parse_video_rate()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-17lavfi: use designated initializers for AVClassPaul B Mahol
While here: - add missing .version and .category, - make .class_name consistent across filters, - align declarations. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-16lavfi: update some deprecated functionsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-04lavfi: use av_default_item_name() as filter private context loggerStefano Sabatini
avfilter_default_filter_name() is supposed to access an AVFilterContext struct, if used with a private struct it will cause a crash since it will access fields which are non defined in the private struct.
2012-06-04lavfi: add avfilter_default_filter_name()Stefano Sabatini
The function is modelled after av_default_item_name(), and will print the name of the instance filter if defined, otherwise the name of the filter. This allows to show the instance name in the log, which is useful when debugging complex filter graphs.
2012-03-07vsrx_mptestsrc: remove duplicate config_props init.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06Mark AVFilterPad[] compound literals as const.Reimar Döffinger
GCC 4.6.2 at least still seems to fail to put them in .rodata though, see also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37303 Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-10-17AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.Clément Bœsch
2011-10-02lavfi: remove usage of deprecated av_opt_set_defaults2() functionStefano Sabatini
Prefer av_opt_set_defaults() instead.
2011-08-11lavfi: port mp test sourceStefano Sabatini