ffmpeg | branch: master | Jean Delvare <jdelv...@suse.de> | Wed Feb 11 14:18:27 2015 +0100| [194165aed8629257b73e53ba951586ed4754cee3] | committer: Michael Niedermayer
cmdutils: fix success path Since commit 934f2d2f5c16df8aad9f401a9fd842b5d9a78b11, cmdutils_read_file() prints a confusing message on success: IO error: Success This is because the error message is printed on the success path as well. Add the missing condition so that it is only printed on error. Signed-off-by: Jean Delvare <jdelv...@suse.de> Cc: Michael Niedermayer <michae...@gmx.at> Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=194165aed8629257b73e53ba951586ed4754cee3 --- cmdutils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmdutils.c b/cmdutils.c index 6c40df9..46d0b4b 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1912,7 +1912,8 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size) } out: - av_log(NULL, AV_LOG_ERROR, "IO error: %s\n", av_err2str(ret)); + if (ret < 0) + av_log(NULL, AV_LOG_ERROR, "IO error: %s\n", av_err2str(ret)); fclose(f); return ret; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
