diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-20 02:23:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-20 02:34:51 +0200 |
| commit | d0492578c805cfd41673aa2cdadf52efde40e307 (patch) | |
| tree | 14fa2c0efa9f3a2c16d946cad36bc10edf0b39f6 /libavfilter | |
| parent | 9ef714328c9527f67be193a120821048b1fe86b5 (diff) | |
| parent | 8096fdf0b6886305ea1a8cb2c869ab2732cd8e11 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
presets: rename presets directory
lavc: make avcodec_get_context_defaults3 "officially" public
lavf: replace av_new_stream->avformat_new_stream part II.
lavf,lavd: replace av_new_stream->avformat_new_stream part I.
lavf: add avformat_new_stream as a replacement for av_new_stream.
Use correct scaling table for bwd-pred MVs in second B-field
Ut Video decoder
Makefile: change presets extension to .avpreset
lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
lavfi: add testsrc source
AVOptions: add documentation.
presets: update libx264 ffpresets
Conflicts:
Changelog
doc/APIchanges
doc/ffmpeg.texi
ffpresets/libx264-ipod320.ffpreset
ffpresets/libx264-ipod640.ffpreset
ffserver.c
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/version.h
libavdevice/libdc1394.c
libavfilter/avfilter.h
libavfilter/vsrc_testsrc.c
libavformat/flvdec.c
libavformat/riff.c
libavformat/version.h
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
| -rw-r--r-- | libavfilter/vsrc_testsrc.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 07c1faa000..138cc3040c 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MINOR 44 -#define LIBAVFILTER_VERSION_MICRO 0 +#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index a59334080d..2447cb355c 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -103,7 +103,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) test->nb_frame = 0; test->pts = 0; - av_log(ctx, AV_LOG_INFO, "size:%dx%d rate:%d/%d duration:%f sar:%d/%d\n", + av_log(ctx, AV_LOG_DEBUG, "size:%dx%d rate:%d/%d duration:%f sar:%d/%d\n", test->w, test->h, frame_rate_q.num, frame_rate_q.den, duration < 0 ? -1 : test->max_pts * av_q2d(test->time_base), test->sar.num, test->sar.den); @@ -156,9 +156,9 @@ static const char *testsrc_get_name(void *ctx) } static const AVClass testsrc_class = { - "TestSourceContext", - testsrc_get_name, - testsrc_options + .class_name = "TestSourceContext", + .item_name = testsrc_get_name, + .option = testsrc_options, }; /** @@ -378,9 +378,9 @@ static const char *rgbtestsrc_get_name(void *ctx) } static const AVClass rgbtestsrc_class = { - "RGBTestSourceContext", - rgbtestsrc_get_name, - testsrc_options + .class_name = "RGBTestSourceContext", + .item_name = rgbtestsrc_get_name, + .option = testsrc_options, }; #define R 0 |