[FFmpeg-cvslog] r22272 - trunk/libavformat/oggparsedirac.c

[conrad]

Author: conrad
Date: Sun Mar  7 03:26:34 2010
New Revision: 22272

Log:
Fix warning about incompatible pointer types

Modified:
   trunk/libavformat/oggparsedirac.c

Modified: trunk/libavformat/oggparsedirac.c
==============================================================================
--- trunk/libavformat/oggparsedirac.c	Sun Mar  7 03:26:30 2010	(r22271)
+++ trunk/libavformat/oggparsedirac.c	Sun Mar  7 03:26:34 2010	(r22272)
@@ -47,9 +47,10 @@ static int dirac_header(AVFormatContext 
 }
 
 // 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;