diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 04:01:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 04:03:50 +0200 |
| commit | 4778783160fb8d7aa39dafdabc756f1691b830f7 (patch) | |
| tree | 4b79ab7e0bcefb304b8a4f3c32908d3217d6b4a9 /libavfilter | |
| parent | dcd207c4cbcd9dd72b73e5b544c055b29885be64 (diff) | |
| parent | 3b266da3d35f3f7a61258b78384dfe920d875d29 (diff) | |
| download | ffmpeg-4778783160fb8d7aa39dafdabc756f1691b830f7.tar.gz | |
Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'
* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
avconv: add support for complex filtergraphs.
avconv: make filtergraphs global.
avconv: move filtered_frame from InputStream to OutputStream.
avconv: don't set output width/height directly from input value.
avconv: move resample_{width,height,pix_fmt} to InputStream.
avconv: remove a useless variable from OutputStream.
avconv: get output pixel format from lavfi.
graphparser: fix the order in which unlabeled input links are returned.
avconv: change {input,output}_{streams,files} into arrays of pointers.
avconv: don't pass input/output streams to some functions.
Conflicts:
cmdutils.c
cmdutils.h
doc/ffmpeg.texi
ffmpeg.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/graphparser.c | 2 | ||||
| -rw-r--r-- | libavfilter/sink_buffer.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index af4b566f1b..e1d6ec2cf7 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -242,7 +242,7 @@ static int link_filter_inouts(AVFilterContext *filt_ctx, } else { p->filter_ctx = filt_ctx; p->pad_idx = pad; - insert_inout(open_inputs, p); + append_inout(open_inputs, &p); } } diff --git a/libavfilter/sink_buffer.c b/libavfilter/sink_buffer.c index 926362bef8..8eb695e167 100644 --- a/libavfilter/sink_buffer.c +++ b/libavfilter/sink_buffer.c @@ -165,9 +165,9 @@ static av_cold int vsink_init(AVFilterContext *ctx, const char *args, void *opaq av_unused AVBufferSinkParams *params; if (!opaque) { - av_log(ctx, AV_LOG_ERROR, + av_log(ctx, AV_LOG_WARNING, "No opaque field provided\n"); - return AVERROR(EINVAL); + buf->pixel_fmts = NULL; } else { #if FF_API_OLD_VSINK_API const int *pixel_fmts = (const enum PixelFormat *)opaque; @@ -194,7 +194,11 @@ static int vsink_query_formats(AVFilterContext *ctx) { BufferSinkContext *buf = ctx->priv; - avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(buf->pixel_fmts)); + if (buf->pixel_fmts) + avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(buf->pixel_fmts)); + else + avfilter_default_query_formats(ctx); + return 0; } |