Mercurial > libavformat.hg

changeset 1513:7d1a53de280a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to libnut API, non-negative errors
author ods15
date Thu, 16 Nov 2006 07:33:25 +0000
parents ac40b8da1636
children 958decd51c1f
files libnut.c
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libnut.c	Wed Nov 15 11:29:39 2006 +0000
+++ b/libnut.c	Thu Nov 16 07:33:25 2006 +0000
@@ -206,7 +206,7 @@
     int ret, i;
 
     if ((ret = nut_read_headers(nut, &s, NULL))) {
-        if (ret < 0) av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(-ret));
+        av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret));
         nut_demuxer_uninit(nut);
         return -1;
     }
@@ -262,10 +262,13 @@
     nut_packet_t pd;
     int ret;
 
-    while ((ret = nut_read_next_packet(priv->nut, &pd)) < 0)
-        av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(-ret));
+    ret = nut_read_next_packet(priv->nut, &pd);
 
-    if (ret || av_new_packet(pkt, pd.len) < 0) return -1;
+    if (ret || av_new_packet(pkt, pd.len) < 0) {
+        if (ret != NUT_ERR_EOF)
+            av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret));
+        return -1;
+    }
 
     if (pd.flags & NUT_FLAG_KEY) pkt->flags |= PKT_FLAG_KEY;
     pkt->pts = pd.pts;