RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-08 16:19:33 +00:00
Code Issues Projects Releases Wiki Activity

nutdec: minor simplification.

Browse Source 
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>
This commit is contained in:
Reimar Döffinger 2012-04-28 21:14:03 +02:00
parent 1d128e5814
commit 370211f470
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/nutdec.c
View File

@ -904,12 +904,10 @@ static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index,
av_assert0(nut->last_syncpoint_pos == *pos_arg); av_assert0(nut->last_syncpoint_pos == *pos_arg);
av_log(s, AV_LOG_DEBUG, "return %"PRId64" %"PRId64"\n", pts, back_ptr); av_log(s, AV_LOG_DEBUG, "return %"PRId64" %"PRId64"\n", pts, back_ptr);
if (stream_index == -1) if (stream_index == -2)
return pts;
else if (stream_index == -2)
return back_ptr; return back_ptr;
av_assert0(stream_index == -1);
av_assert0(0); return pts;
} }
static int read_seek(AVFormatContext *s, int stream_index, static int read_seek(AVFormatContext *s, int stream_index,