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>

1 files changed, 11 insertions, 5 deletions

diff --git a/libavfilter/sink_buffer.c b/libavfilter/sink_buffer.c
index c4f6118335..85fbee2031 100644
--- a/libavfilter/sink_buffer.c
+++ b/libavfilter/sink_buffer.c
@@ -163,12 +163,15 @@ int av_buffersink_poll_frame(AVFilterContext *ctx)
 
 #if CONFIG_BUFFERSINK_FILTER
 
-static av_cold int vsink_init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int vsink_init(AVFilterContext *ctx, const char *args)
 {
     BufferSinkContext *buf = ctx->priv;
-    AVBufferSinkParams *params = (AVBufferSinkParams *)opaque;
+    AVBufferSinkParams *params = NULL;
 
-    if (!opaque) {
+//     if(args && !strcmp(args, "opaque"))
+//         params = (AVBufferSinkParams *)(args+7);
+
+    if (!params) {
         av_log(ctx, AV_LOG_WARNING,
                "No opaque field provided\n");
         buf->pixel_fmts = NULL;
@@ -228,10 +231,13 @@ static void filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
     end_frame(link);
 }
 
-static av_cold int asink_init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int asink_init(AVFilterContext *ctx, const char *args)
 {
     BufferSinkContext *buf = ctx->priv;
-    AVABufferSinkParams *params = opaque;
+    AVABufferSinkParams *params = NULL;
+
+//     if(args && !strcmp(args, "opaque"))
+//         params = (AVABufferSinkParams *)(args+7);
 
     if (params && params->sample_fmts) {
         buf->sample_fmts     = ff_copy_int_list  (params->sample_fmts);