From 370211f4702f0b26c06bfe078c4a4da9493d1161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Sat, 28 Apr 2012 21:14:03 +0200 Subject: [PATCH] nutdec: minor simplification. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fixes an (incorrect) "control reaches end of non-void function" warning with some compilers. Signed-off-by: Reimar Döffinger --- libavformat/nutdec.c | 8 +++----- 1 file 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,