From 0ba0c8debb0e3b1f4277eee3175b6f85e730353a Mon Sep 17 00:00:00 2001
From: Benoit Fouet <benoit.fouet@free.fr>
Date: Thu, 10 May 2007 13:25:33 +0000
Subject: [PATCH] Use url_fopen error code when opening input file handle the
AVERROR_NOENT error case in print_error
Originally committed as revision 8977 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
cmdutils.c | 3 +++
libavformat/utils.c | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cmdutils.c b/cmdutils.c
index 74829c96cfa..9b2f16a4bea 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -138,6 +138,9 @@ void print_error(const char *filename, int err)
case AVERROR_NOMEM:
fprintf(stderr, "%s: memory allocation error occured\n", filename);
break;
+ case AVERROR_NOENT:
+ fprintf(stderr, "%s: no such file or directory\n", filename);
+ break;
default:
fprintf(stderr, "%s: Error while opening file\n", filename);
break;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 386989fcc25..ab7345ede20 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -417,8 +417,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
if (!fmt || must_open_file) {
/* if no file needed do not try to open one */
- if (url_fopen(pb, filename, URL_RDONLY) < 0) {
- err = AVERROR_IO;
+ if ((err=url_fopen(pb, filename, URL_RDONLY)) < 0) {
goto fail;
}
file_opened = 1;
--
GitLab