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>
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
static int split_init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
static int split_init(AVFilterContext *ctx, const char *args)
|
||||
{
|
||||
int i, nb_outputs = 2;
|
||||
|
||||
|
Reference in New Issue
Block a user