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:
f8d33a3
)
Fix compile warning.
author
Ronald S. Bultje
<rsbultje@gmail.com>
Mon, 7 Feb 2011 01:33:53 +0000
(20:33 -0500)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 9 Feb 2011 02:31:17 +0000
(
03:31
+0100)
Change int64_t into a int, which caused this compiler warning:
libavformat/oggparseskeleton.c:64: warning: passing argument 2 of ‘av_reduce’ from incompatible pointer type
(cherry picked from commit
69ff14920429c9e128a8bcf65ce3f4b4aa93f3d1
)
libavformat/oggparseskeleton.c
patch
|
blob
|
history
diff --git
a/libavformat/oggparseskeleton.c
b/libavformat/oggparseskeleton.c
index
f0e17f9
..
e318e9e
100644
(file)
--- a/
libavformat/oggparseskeleton.c
+++ b/
libavformat/oggparseskeleton.c
@@
-60,7
+60,7
@@
static int skeleton_header(AVFormatContext *s, int idx)
start_den = AV_RL64(buf+20);
if (start_den) {
- int
64_t
base_den;
+ int base_den;
av_reduce(&start_time, &base_den, start_num, start_den, INT_MAX);
av_set_pts_info(st, 64, 1, base_den);
os->lastpts =