diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 23:57:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 00:04:49 +0100 |
| commit | d304cb49eb09f6934262e87c97e1ae49f4d70e5c (patch) | |
| tree | 0df2e3dd751a67460f87017b1c664a31adbbb820 /libavformat | |
| parent | bd12634d6b83e196515c52ccaa9b7513c1023b6f (diff) | |
| parent | 898276c16b1683ac77723e97574a3bfdb29507fd (diff) | |
| download | ffmpeg-d304cb49eb09f6934262e87c97e1ae49f4d70e5c.tar.gz | |
Merge commit '898276c16b1683ac77723e97574a3bfdb29507fd'
* commit '898276c16b1683ac77723e97574a3bfdb29507fd':
r3d: Fix pos type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/r3d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 0719fb601a..7a6f7a32f2 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -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; |