[SCM] libav/experimental: matroskadec: allows inserting chapters with unspecified end
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:21:01 UTC 2013
The following commit has been merged in the experimental branch:
commit ad9d62ef22de83b36fc7da009734292a209ab765
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Thu May 22 23:04:02 2008 +0000
matroskadec: allows inserting chapters with unspecified end
Originally committed as revision 13242 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 2b6f2ba..b038267 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2250,8 +2250,12 @@ matroska_parse_chapters(AVFormatContext *s)
}
}
- if(start != AV_NOPTS_VALUE && end != AV_NOPTS_VALUE)
- res = ff_new_chapter(s, start * AV_TIME_BASE / 1000000000 , end * AV_TIME_BASE / 1000000000, title ? title : "(unnamed)");
+ if (start != AV_NOPTS_VALUE) {
+ start = start * AV_TIME_BASE / 1000000000;
+ if (end != AV_NOPTS_VALUE)
+ end = end * AV_TIME_BASE / 1000000000;
+ res = ff_new_chapter(s, start, end, title ? title : "(unnamed)");
+ }
av_free(title);
break;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list