aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-04-28 21:14:03 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-04-29 13:03:15 +0200
commit370211f4702f0b26c06bfe078c4a4da9493d1161 (patch)
treef7b9077ddc3a378d97be59ce776c378b0b0e12e0 /libavformat
parent1d128e5814ed9ee1b81d2db4949cbc4fe6b28ca0 (diff)
downloadffmpeg-370211f4702f0b26c06bfe078c4a4da9493d1161.tar.gz
nutdec: minor simplification.
Also fixes an (incorrect) "control reaches end of non-void function" warning with some compilers. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/nutdec.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index ddaa4b0ce0..04e1dcfd0f 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -904,12 +904,10 @@ static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index,
av_assert0(nut->last_syncpoint_pos == *pos_arg);
av_log(s, AV_LOG_DEBUG, "return %"PRId64" %"PRId64"\n", pts, back_ptr);
- if (stream_index == -1)
- return pts;
- else if (stream_index == -2)
+ if (stream_index == -2)
return back_ptr;
-
- av_assert0(0);
+ av_assert0(stream_index == -1);
+ return pts;
}
static int read_seek(AVFormatContext *s, int stream_index,