From 148e8f2d295b5e8eb92dc9a1561e8e31bbb0a6d5 Mon Sep 17 00:00:00 2001 From: David Conrad Date: Sun, 7 Mar 2010 02:26:34 +0000 Subject: Fix warning about incompatible pointer types Originally committed as revision 22272 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/oggparsedirac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat/oggparsedirac.c') diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c index 5a907ec178..59a6deec49 100644 --- 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; -- cgit v1.2.3