aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2007-05-10 13:25:33 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2007-05-10 13:25:33 +0000
commit0ba0c8debb0e3b1f4277eee3175b6f85e730353a (patch)
treecb9afaf3076a13280a1c9999c49450667ce96db4
parent35e7f087bacb52d6fdab42f578a5eee3a87be9b6 (diff)
downloadffmpeg-0ba0c8debb0e3b1f4277eee3175b6f85e730353a.tar.gz
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
-rw-r--r--cmdutils.c3
-rw-r--r--libavformat/utils.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c
index 74829c96cf..9b2f16a4be 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 386989fcc2..ab7345ede2 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;