[FFmpeg-cvslog] nutdec: Always return a value from nut_read_timestamp()

Diego Biurrun git at videolan.org
Tue Jan 15 15:30:18 CET 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Jan 15 00:39:23 2013 +0100| [d8c772de53d29afb1bada88afa859fce8489c668] | committer: Luca Barbato

nutdec: Always return a value from nut_read_timestamp()

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 at gentoo.org>

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

 libavformat/nutdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index b705987..cee411b 100644
--- 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,



More information about the ffmpeg-cvslog mailing list