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:
99853cb
)
nutdec: Always return a value from nut_read_timestamp()
author
Diego Biurrun
<diego@biurrun.de>
Mon, 14 Jan 2013 23:39:23 +0000
(
00:39
+0100)
committer
Luca Barbato
<lu_zero@gentoo.org>
Tue, 15 Jan 2013 01:15:09 +0000
(
02:15
+0100)
The function is a callback that is called by ff_gen_search with
a constant stream index.
Avoid a false positive on older gcc version.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavformat/nutdec.c
patch
|
blob
|
history
diff --git
a/libavformat/nutdec.c
b/libavformat/nutdec.c
index
b705987
..
cee411b
100644
(file)
--- a/
libavformat/nutdec.c
+++ b/
libavformat/nutdec.c
@@
-910,7
+910,7
@@
static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index,
else if (stream_index == -2)
return back_ptr;
-
assert(0)
;
+
return AV_NOPTS_VALUE
;
}
static int read_seek(AVFormatContext *s, int stream_index,