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/src_movie.c | |
| parent | 37b5959d9689f5310640c7a0beaa7784c58bfa6f (diff) | |
| parent | a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a (diff) | |
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/src_movie.c')
| -rw-r--r-- | libavfilter/src_movie.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 1b83ecb15d..c91b8345d6 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -82,7 +82,7 @@ static const AVOption movie_options[]= { AVFILTER_DEFINE_CLASS(movie); -static av_cold int movie_common_init(AVFilterContext *ctx, const char *args, void *opaque, +static av_cold int movie_common_init(AVFilterContext *ctx, const char *args, enum AVMediaType type) { MovieContext *movie = ctx->priv; @@ -198,12 +198,12 @@ static av_cold void movie_common_uninit(AVFilterContext *ctx) #if CONFIG_MOVIE_FILTER -static av_cold int movie_init(AVFilterContext *ctx, const char *args, void *opaque) +static av_cold int movie_init(AVFilterContext *ctx, const char *args) { MovieContext *movie = ctx->priv; int ret; - if ((ret = movie_common_init(ctx, args, opaque, AVMEDIA_TYPE_VIDEO)) < 0) + if ((ret = movie_common_init(ctx, args, AVMEDIA_TYPE_VIDEO)) < 0) return ret; movie->w = movie->codec_ctx->width; @@ -345,12 +345,12 @@ AVFilter avfilter_vsrc_movie = { #if CONFIG_AMOVIE_FILTER -static av_cold int amovie_init(AVFilterContext *ctx, const char *args, void *opaque) +static av_cold int amovie_init(AVFilterContext *ctx, const char *args) { MovieContext *movie = ctx->priv; int ret; - if ((ret = movie_common_init(ctx, args, opaque, AVMEDIA_TYPE_AUDIO)) < 0) + if ((ret = movie_common_init(ctx, args, AVMEDIA_TYPE_AUDIO)) < 0) return ret; movie->bps = av_get_bytes_per_sample(movie->codec_ctx->sample_fmt); |