From adc725b55824071eac463def514ecfa5cdb188a7 Mon Sep 17 00:00:00 2001
From: David Conrad <lessen42@gmail.com>
Date: Fri, 16 Apr 2010 12:21:38 +0000
Subject: [PATCH] oggdec: Move warning about missing granule to the correct
 place

Originally committed as revision 22891 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/oggdec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 3b59e002ee..f24f697ada 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -362,6 +362,9 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize, int64_t *fpo
             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(AVFormatContext *s, int idx, int64_t *dts)
             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;
 }