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

diff --git a/cmdutils.c b/cmdutils.c
index 74829c9..9b2f16a 100644 (file)
--- 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 386989f..ab7345e 100644 (file)
--- 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;