[FFmpeg-cvslog] avdevice/lavfi: fix self assignment warning

Ganesh Ajjanagadde git at videolan.org
Sun Aug 23 20:08:02 CEST 2015


ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde at gmail.com> | Sat Aug 22 23:24:38 2015 -0400| [9aaac0410767a1e45a60c535b10e913690b0fcc1] | committer: Michael Niedermayer

avdevice/lavfi: fix self assignment warning

FAIL(ret) expands to statements including a silly ret=ret.
This triggers a -Wself-assign on confirmed clang 3.6, and so we fix it.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde at gmail.com>
Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavdevice/lavfi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c
index d92e299..3453b4d 100644
--- a/libavdevice/lavfi.c
+++ b/libavdevice/lavfi.c
@@ -337,7 +337,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
     }
 
     if ((ret = create_subcc_streams(avctx)) < 0)
-        FAIL(ret);
+        goto end;
 
     if (!(lavfi->decoded_frame = av_frame_alloc()))
         FAIL(AVERROR(ENOMEM));



More information about the ffmpeg-cvslog mailing list