[FFmpeg-cvslog] nutdec: minor simplification.

[Reimar Döffinger]

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sat Apr 28 21:14:03 2012 +0200| [370211f4702f0b26c06bfe078c4a4da9493d1161] | committer: Reimar Döffinger

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 at gmx.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=370211f4702f0b26c06bfe078c4a4da9493d1161
---

 libavformat/nutdec.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index ddaa4b0..04e1dcf 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,