Mercurial > libavformat.hg

changeset 5065:4c7f6c2d0e0e libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reindent after last patch.
author reimar
date Wed, 24 Jun 2009 09:40:00 +0000
parents 1ed8004a3ef5
children 2bc8a9853970
files mov.c
diffstat 1 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/mov.c	Wed Jun 24 09:38:42 2009 +0000
+++ b/mov.c	Wed Jun 24 09:40:00 2009 +0000
@@ -2104,23 +2104,23 @@
     sc->current_sample++;
 
     if (st->discard != AVDISCARD_ALL) {
-    if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
-        av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n",
-               sc->ffindex, sample->pos);
-        return -1;
-    }
-    ret = av_get_packet(sc->pb, pkt, sample->size);
-    if (ret < 0)
-        return ret;
-#if CONFIG_DV_DEMUXER
-    if (mov->dv_demux && sc->dv_audio_container) {
-        dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);
-        av_free(pkt->data);
-        pkt->size = 0;
-        ret = dv_get_packet(mov->dv_demux, pkt);
+        if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
+            av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n",
+                   sc->ffindex, sample->pos);
+            return -1;
+        }
+        ret = av_get_packet(sc->pb, pkt, sample->size);
         if (ret < 0)
             return ret;
-    }
+#if CONFIG_DV_DEMUXER
+        if (mov->dv_demux && sc->dv_audio_container) {
+            dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);
+            av_free(pkt->data);
+            pkt->size = 0;
+            ret = dv_get_packet(mov->dv_demux, pkt);
+            if (ret < 0)
+                return ret;
+        }
 #endif
     }