[FFmpeg-cvslog] r22891 - trunk/libavformat/oggdec.c

[conrad]

Author: conrad
Date: Fri Apr 16 14:21:38 2010
New Revision: 22891

Log:
oggdec: Move warning about missing granule to the correct place

Modified:
   trunk/libavformat/oggdec.c

Modified: trunk/libavformat/oggdec.c
==============================================================================
--- trunk/libavformat/oggdec.c	Fri Apr 16 14:21:35 2010	(r22890)
+++ trunk/libavformat/oggdec.c	Fri Apr 16 14:21:38 2010	(r22891)
@@ -362,6 +362,9 @@ ogg_packet (AVFormatContext * s, int *st
             idx, os->psize, os->pstart);
 #endif
 
+    if (os->granule == -1)
+        av_log(s, AV_LOG_WARNING, "Page at %lld is missing granule\n", os->page_pos);
+
     ogg->curidx = idx;
     os->incomplete = 0;
 
@@ -512,8 +515,7 @@ static int64_t ogg_calc_pts(AVFormatCont
             else
                 os->lastpts = ogg_gptopts(s, idx, os->granule, &os->lastdts);
             os->granule = -1LL;
-        } else
-            av_log(s, AV_LOG_WARNING, "Packet is missing granule\n");
+        }
     }
     return pts;
 }