OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e48f7ff
)
Fix warning about incompatible pointer types
author
David Conrad
<lessen42@gmail.com>
Sun, 7 Mar 2010 02:26:34 +0000
(
02:26
+0000)
committer
David Conrad
<lessen42@gmail.com>
Sun, 7 Mar 2010 02:26:34 +0000
(
02:26
+0000)
Originally committed as revision 22272 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/oggparsedirac.c
patch
|
blob
|
history
diff --git
a/libavformat/oggparsedirac.c
b/libavformat/oggparsedirac.c
index
5a907ec
..
59a6dee
100644
(file)
--- a/
libavformat/oggparsedirac.c
+++ b/
libavformat/oggparsedirac.c
@@
-47,9
+47,10
@@
static int dirac_header(AVFormatContext *s, int idx)
}
// various undocument things: granule is signed (only for dirac!)
-static uint64_t dirac_gptopts(AVFormatContext *s, int idx,
int64_t gp
,
+static uint64_t dirac_gptopts(AVFormatContext *s, int idx,
uint64_t granule
,
int64_t *dts_out)
{
+ int64_t gp = granule;
struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + idx;