Mercurial > libavformat.hg

diff utils.c @ 90:27d6df9208d4 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
author michaelni
date Tue, 18 Mar 2003 17:22:23 +0000
parents 25062c9b1f86
children b7ce3b3dc171
line wrap: on
line diff
--- a/utils.c	Sun Mar 16 21:03:20 2003 +0000
+++ b/utils.c	Tue Mar 18 17:22:23 2003 +0000
@@ -355,7 +355,7 @@
     /* if still no format found, error */
     if (!fmt) {
         err = AVERROR_NOFMT;
-        goto fail;
+        goto fail1;
     }
         
     /* XXX: suppress this hack for redirectors */
@@ -383,7 +383,7 @@
         ic->priv_data = av_mallocz(fmt->priv_data_size);
         if (!ic->priv_data) {
             err = AVERROR_NOMEM;
-            goto fail;
+        goto fail1;
         }
     } else
         ic->priv_data = NULL;
@@ -397,7 +397,7 @@
     *ic_ptr = ic;
     return 0;
  fail1:
-    if (!(fmt->flags & AVFMT_NOFILE)) {
+    if (!fmt || !(fmt->flags & AVFMT_NOFILE)) {
         url_fclose(&ic->pb);
     }
  fail: