virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avdevice/lavfi: Simplify non-AV stream check

Browse Source 
Fixes a clang warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-05 16:15:22 +02:00
parent 8fa695a9e3
commit 75bd83d448
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavdevice/lavfi.c
View File

@@ -184,14 +184,6 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
FAIL(AVERROR(EINVAL)); FAIL(AVERROR(EINVAL));
} }
/* is an audio or video output? */
type = inout->filter_ctx->output_pads[inout->pad_idx].type;
if (type != AVMEDIA_TYPE_VIDEO && type != AVMEDIA_TYPE_AUDIO) {
av_log(avctx, AV_LOG_ERROR,
"Output '%s' is not a video or audio output, not yet supported\n", inout->name);
FAIL(AVERROR(EINVAL));
}
if (lavfi->stream_sink_map[stream_idx] != -1) { if (lavfi->stream_sink_map[stream_idx] != -1) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"An output with stream index %d was already specified\n", "An output with stream index %d was already specified\n",
@@ -252,6 +244,10 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
AV_OPT_SEARCH_CHILDREN); AV_OPT_SEARCH_CHILDREN);
if (ret < 0) if (ret < 0)
goto end; goto end;
} else {
av_log(avctx, AV_LOG_ERROR,
"Output '%s' is not a video or audio output, not yet supported\n", inout->name);
FAIL(AVERROR(EINVAL));
} }
lavfi->sinks[i] = sink; lavfi->sinks[i] = sink;