diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-26 23:27:59 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-26 23:57:07 +0200 |
commit | 052f4f859cfee9bb86ea3ccb0c56ea11d050ef17 (patch) | |
tree | 118f522d94de18bcf855c526026d6c18cf5c6b3d /libavfilter/vsrc_testsrc.c | |
parent | 37b5959d9689f5310640c7a0beaa7784c58bfa6f (diff) | |
parent | a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a (diff) | |
download | ffmpeg-streaming-052f4f859cfee9bb86ea3ccb0c56ea11d050ef17.zip ffmpeg-streaming-052f4f859cfee9bb86ea3ccb0c56ea11d050ef17.tar.gz |
Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'
* commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a':
lavfi: remove 'opaque' parameter from AVFilter.init()
mov: do not try to read total disc/track number if data atom is too short.
avconv: fix -force_key_frames
dxva2_h264: fix signaling of mbaff frames
x86: fft: elf64: fix PIC build
Conflicts:
ffmpeg.c
libavcodec/v210dec.h
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_overlay.c
libavfilter/vsrc_color.c
libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsrc_testsrc.c')
-rw-r--r-- | libavfilter/vsrc_testsrc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 6e706f0..0c07f06 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -72,7 +72,7 @@ static const AVOption testsrc_options[]= { { NULL }, }; -static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) +static av_cold int init(AVFilterContext *ctx, const char *args) { TestSourceContext *test = ctx->priv; AVRational frame_rate_q; @@ -167,13 +167,13 @@ static const AVClass nullsrc_class = { static void nullsrc_fill_picture(AVFilterContext *ctx, AVFilterBufferRef *picref) { } -static av_cold int nullsrc_init(AVFilterContext *ctx, const char *args, void *opaque) +static av_cold int nullsrc_init(AVFilterContext *ctx, const char *args) { TestSourceContext *test = ctx->priv; test->class = &nullsrc_class; test->fill_picture_fn = nullsrc_fill_picture; - return init(ctx, args, opaque); + return init(ctx, args); } AVFilter avfilter_vsrc_nullsrc = { @@ -373,13 +373,13 @@ static void test_fill_picture(AVFilterContext *ctx, AVFilterBufferRef *picref) } } -static av_cold int test_init(AVFilterContext *ctx, const char *args, void *opaque) +static av_cold int test_init(AVFilterContext *ctx, const char *args) { TestSourceContext *test = ctx->priv; test->class = &testsrc_class; test->fill_picture_fn = test_fill_picture; - return init(ctx, args, opaque); + return init(ctx, args); } static int test_query_formats(AVFilterContext *ctx) @@ -476,13 +476,13 @@ static void rgbtest_fill_picture(AVFilterContext *ctx, AVFilterBufferRef *picref } } -static av_cold int rgbtest_init(AVFilterContext *ctx, const char *args, void *opaque) +static av_cold int rgbtest_init(AVFilterContext *ctx, const char *args) { TestSourceContext *test = ctx->priv; test->class = &rgbtestsrc_class; test->fill_picture_fn = rgbtest_fill_picture; - return init(ctx, args, opaque); + return init(ctx, args); } static int rgbtest_query_formats(AVFilterContext *ctx) |