Commit d304cb49 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '898276c1'

* commit '898276c1':
  r3d: Fix pos type
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents bd12634d 898276c1
......@@ -221,7 +221,7 @@ static int r3d_read_redv(AVFormatContext *s, AVPacket *pkt, Atom *atom)
AVStream *st = s->streams[0];
int tmp;
int av_unused tmp2;
uint64_t pos = avio_tell(s->pb);
int64_t pos = avio_tell(s->pb);
unsigned dts;
int ret;
......@@ -276,7 +276,7 @@ static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom)
AVStream *st = s->streams[1];
int av_unused tmp, tmp2;
int samples, size;
uint64_t pos = avio_tell(s->pb);
int64_t pos = avio_tell(s->pb);
unsigned dts;
int ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment