* 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.h (1 of 65 files). Show all
Unified · Split
| @@ -568,10 +568,8 @@ typedef struct AVFilter { · 567 unmodified lines | |||
| 568 | /** | 568 | /** |
| 569 | * Filter initialization function. Args contains the user-supplied | 569 | * Filter initialization function. Args contains the user-supplied |
| 570 | * parameters. FIXME: maybe an AVOption-based system would be better? | 570 | * parameters. FIXME: maybe an AVOption-based system would be better? |
| 571 | * opaque is data provided by the code requesting creation of the filter, | ||
| 572 | * and is used to pass data to the filter. | ||
| 573 | */ | 571 | */ |
| 574 | int (*init)(AVFilterContext *ctx, const char *args, void *opaque); | 572 | int (*init)(AVFilterContext *ctx, const char *args); |
| 575 | 573 | ||
| 576 | /** | 574 | /** |
| 577 | * Filter uninitialization function. Should deallocate any memory held | 575 | * Filter uninitialization function. Should deallocate any memory held |