[FFmpeg-cvslog] avdevice/lavfi: Simplify non-AV stream check

Michael Niedermayer git at videolan.org
Thu Aug 7 15:46:07 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  5 16:15:22 2014 +0200| [75bd83d448fec8108cdbb6a4f78cd0f7b1fc411e] | committer: Michael Niedermayer

avdevice/lavfi: Simplify non-AV stream check

Fixes a clang warning
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75bd83d448fec8108cdbb6a4f78cd0f7b1fc411e
---

 libavdevice/lavfi.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c
index f1c88ac..4cfe804 100644
--- a/libavdevice/lavfi.c
+++ b/libavdevice/lavfi.c
@@ -184,14 +184,6 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
             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) {
             av_log(avctx,  AV_LOG_ERROR,
                    "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);
             if (ret < 0)
                 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;



More information about the ffmpeg-cvslog mailing list