diff options
| author | David Conrad <lessen42@gmail.com> | 2010-03-07 02:26:34 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2010-03-07 02:26:34 +0000 |
| commit | 148e8f2d295b5e8eb92dc9a1561e8e31bbb0a6d5 (patch) | |
| tree | ac08d2d047857c207c20a6515b042a179f1ad464 /libavformat/oggparsedirac.c | |
| parent | e48f7ff3cb73fbaba0f5b8d442dc5909f705c863 (diff) | |
| download | ffmpeg-148e8f2d295b5e8eb92dc9a1561e8e31bbb0a6d5.tar.gz | |
Fix warning about incompatible pointer types
Originally committed as revision 22272 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/oggparsedirac.c')
| -rw-r--r-- | libavformat/oggparsedirac.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |