OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f8b6ba5
)
avformat/omadec: Use 64bit for ret to avoid overflow
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 20 Feb 2015 20:01:54 +0000
(21:01 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 20 Feb 2015 20:14:32 +0000
(21:14 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
0f55bc29d41585d110b126cb4ed4b395fd46d7ac
)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/omadec.c
patch
|
blob
|
history
diff --git
a/libavformat/omadec.c
b/libavformat/omadec.c
index
b10f56f
..
f5d09f6
100644
(file)
--- a/
libavformat/omadec.c
+++ b/
libavformat/omadec.c
@@
-470,7
+470,7
@@
static int oma_read_seek(struct AVFormatContext *s,
int stream_index, int64_t timestamp, int flags)
{
OMAContext *oc = s->priv_data;
- int err = ff_pcm_read_seek(s, stream_index, timestamp, flags);
+ int
64_t
err = ff_pcm_read_seek(s, stream_index, timestamp, flags);
if (!oc->encrypted)
return err;