aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-05 17:07:28 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-03-06 09:31:49 +0100
commit124c78fd4449ed3ddbdc2398e7570119bb8babf9 (patch)
treed0eb6d7dd00b951efb486d22ab563b2350893120
parent1af235f6b3449dee85c81d7a89f03c5c491224f6 (diff)
downloadffmpeg-124c78fd4449ed3ddbdc2398e7570119bb8babf9.tar.gz
avformat/oggparsevorbis: dont use invalid granules
Fixes Ticket3437 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 12b97dd375736c332989c50ea68af9d834b2621f)
-rw-r--r--libavformat/oggparsevorbis.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 2739123389..53e69dffa2 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -384,7 +384,7 @@ static int vorbis_packet(AVFormatContext *s, int idx)
* here we parse the duration of each packet in the first page and compare
* the total duration to the page granule to find the encoder delay and
* set the first timestamp */
- if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) {
+ if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS) && (int64_t)os->granule>=0) {
int seg, d;
uint8_t *last_pkt = os->buf + os->pstart;
uint8_t *next_pkt = last_pkt;