diff options
author | David Conrad <lessen42@gmail.com> | 2010-04-16 16:21:38 +0400 |
---|---|---|
committer | David Conrad <lessen42@gmail.com> | 2010-04-16 16:21:38 +0400 |
commit | adc725b55824071eac463def514ecfa5cdb188a7 (patch) | |
tree | 2ec36a7cc93ad224d10811f6049b050312642a0e | |
parent | 44a088eab7f223e0b79ae5296cdb07d6f165c91d (diff) |
oggdec: Move warning about missing granule to the correct place
Originally committed as revision 22891 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavformat/oggdec.c | 6 |
1 files 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; } |