comparison oggparsedirac.c @ 5763:14f90d20ef05 libavformat

Fix warning about incompatible pointer types
author conrad
date Sun, 07 Mar 2010 02:26:34 +0000
parents 52c7b29eca31
children 536e5527c1e0
comparison
equal deleted inserted replaced
5762:87a2727fd609 5763:14f90d20ef05
45 st->time_base = (AVRational){st->codec->time_base.num, 2*st->codec->time_base.den}; 45 st->time_base = (AVRational){st->codec->time_base.num, 2*st->codec->time_base.den};
46 return 1; 46 return 1;
47 } 47 }
48 48
49 // various undocument things: granule is signed (only for dirac!) 49 // various undocument things: granule is signed (only for dirac!)
50 static uint64_t dirac_gptopts(AVFormatContext *s, int idx, int64_t gp, 50 static uint64_t dirac_gptopts(AVFormatContext *s, int idx, uint64_t granule,
51 int64_t *dts_out) 51 int64_t *dts_out)
52 { 52 {
53 int64_t gp = granule;
53 struct ogg *ogg = s->priv_data; 54 struct ogg *ogg = s->priv_data;
54 struct ogg_stream *os = ogg->streams + idx; 55 struct ogg_stream *os = ogg->streams + idx;
55 56
56 unsigned dist = ((gp >> 14) & 0xff00) | (gp & 0xff); 57 unsigned dist = ((gp >> 14) & 0xff00) | (gp & 0xff);
57 int64_t dts = (gp >> 31); 58 int64_t dts = (gp >> 31);