diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:38:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:38:11 +0100 |
| commit | 7fff5781b6a94fa6f29a1e508f5badbbecf35232 (patch) | |
| tree | fbe0bdabf6d302cf89d24002df7904a8f2dca899 /libavfilter/vf_showinfo.c | |
| parent | b64077bebe1f29adb2e72af1d9382c35f73ae651 (diff) | |
| parent | e4a7b2177d14678ae240edcabaacfe2b14619b7b (diff) | |
Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'
* commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b':
vf_showinfo: remove its useless init function
AVOptions: fix using named constants with child contexts.
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
| -rw-r--r-- | libavfilter/vf_showinfo.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 6c412e5abc..dd97843b96 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -35,13 +35,6 @@ typedef struct { unsigned int frame; } ShowInfoContext; -static av_cold int init(AVFilterContext *ctx, const char *args) -{ - ShowInfoContext *showinfo = ctx->priv; - showinfo->frame = 0; - return 0; -} - static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -111,7 +104,6 @@ AVFilter avfilter_vf_showinfo = { .description = NULL_IF_CONFIG_SMALL("Show textual information for each video frame."), .priv_size = sizeof(ShowInfoContext), - .init = init, .inputs = avfilter_vf_showinfo_inputs, |