[FFmpeg-cvslog] nsvdec: Propagate error values instead of returning 0 in nsv_read_header().

Diego Biurrun git at videolan.org
Mon Apr 2 01:45:32 CEST 2012


ffmpeg | branch: release/0.8 | Diego Biurrun <diego at biurrun.de> | Thu Jun 23 13:27:21 2011 +0200| [6fe5038753ec8da6770b1872588f5d83f6f13963] | committer: Reinhard Tartler

nsvdec: Propagate error values instead of returning 0 in nsv_read_header().

This eliminates a warning about a set-but-unused variable.
(cherry picked from commit 35fa0d47585cef28cd8191dccf0607d90c7667a6)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

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

 libavformat/nsvdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 67c103d..61cc69f 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -542,7 +542,7 @@ static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap)
     err = nsv_read_chunk(s, 1);
 
     av_dlog(s, "parsed header\n");
-    return 0;
+    return err;
 }
 
 static int nsv_read_chunk(AVFormatContext *s, int fill_header)



More information about the ffmpeg-cvslog mailing list