* 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
Showing the changes to libavfilter/avfilter.c (1 of 65 files). Show all
Unified · Split
| @@ -547,7 +547,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 546 unmodified lines | |||
| 547 | int ret=0; | 547 | int ret=0; |
| 548 | 548 | ||
| 549 | if (filter->filter->init) | 549 | if (filter->filter->init) |
| 550 | ret = filter->filter->init(filter, args, opaque); | 550 | ret = filter->filter->init(filter, args); |
| 551 | return ret; | 551 | return ret; |
| 552 | } | 552 | } |
| 553 | 553 | ||