[FFmpeg-cvslog] avformat: change some seeking related assert to av_asserts
Michael Niedermayer
git at videolan.org
Wed Mar 27 23:20:43 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 27 22:53:57 2013 +0100| [460d30406bcac4de89f5092733d713943e43ded1] | committer: Michael Niedermayer
avformat: change some seeking related assert to av_asserts
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=460d30406bcac4de89f5092733d713943e43ded1
---
libavformat/utils.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index f9acc0e..a16f2a6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1738,7 +1738,7 @@ int ff_add_index_entry(AVIndexEntry **index_entries,
if(index<0){
index= (*nb_index_entries)++;
ie= &entries[index];
- assert(index==0 || ie[-1].timestamp < timestamp);
+ av_assert0(index==0 || ie[-1].timestamp < timestamp);
}else{
ie= &entries[index];
if(ie->timestamp != timestamp){
@@ -1854,7 +1854,7 @@ int ff_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts
}
index= av_index_search_timestamp(st, target_ts, flags & ~AVSEEK_FLAG_BACKWARD);
- assert(index < st->nb_index_entries);
+ av_assert0(index < st->nb_index_entries);
if(index >= 0){
e= &st->index_entries[index];
assert(e->timestamp >= target_ts);
@@ -2037,7 +2037,7 @@ static int seek_frame_generic(AVFormatContext *s,
int nonkey=0;
if(st->nb_index_entries){
- assert(st->index_entries);
+ av_assert0(st->index_entries);
ie= &st->index_entries[st->nb_index_entries-1];
if ((ret = avio_seek(s->pb, ie->pos, SEEK_SET)) < 0)
return ret;
More information about the ffmpeg-cvslog
mailing list