OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
83f5877
)
avformat/avidec: allow rounding errors between scale/rate and timebase
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 4 Jun 2014 03:04:13 +0000
(
05:04
+0200)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Mon, 9 Jun 2014 22:09:03 +0000
(
00:09
+0200)
Fixes Ticket3670
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
571ab8344a9a2864d22d01af41283cee9328b927
)
libavformat/avidec.c
patch
|
blob
|
history
diff --git
a/libavformat/avidec.c
b/libavformat/avidec.c
index
ef2032d
..
449c065
100644
(file)
--- a/
libavformat/avidec.c
+++ b/
libavformat/avidec.c
@@
-1700,8
+1700,7
@@
static int avi_read_seek(AVFormatContext *s, int stream_index,
continue;
// av_assert1(st2->codec->block_align);
- av_assert0((int64_t)st2->time_base.num * ast2->rate ==
- (int64_t)st2->time_base.den * ast2->scale);
+ av_assert0(fabs(av_q2d(st2->time_base) - ast2->scale / (double)ast2->rate) < av_q2d(st2->time_base) * 0.00000001);
index = av_index_search_timestamp(st2,
av_rescale_q(timestamp,
st->time_base,