Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat: change some seeking related assert to av_asserts

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/13/merge
Michael Niedermayer 12 years ago
parent 0d6e5a1712
commit 460d30406b
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavformat/utils.c

6
libavformat/utils.c
Unescape View File

@ -1738,7 +1738,7 @@ int ff_add_index_entry(AVIndexEntry **index_entries,
if(index<0){ if(index<0){
index= (*nb_index_entries)++; index= (*nb_index_entries)++;
ie= &entries[index]; ie= &entries[index];
assert(index==0 || ie[-1].timestamp < timestamp); av_assert0(index==0 || ie[-1].timestamp < timestamp);
}else{ }else{
ie= &entries[index]; ie= &entries[index];
if(ie->timestamp != timestamp){ 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); 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){ if(index >= 0){
e= &st->index_entries[index]; e= &st->index_entries[index];
assert(e->timestamp >= target_ts); assert(e->timestamp >= target_ts);
@ -2037,7 +2037,7 @@ static int seek_frame_generic(AVFormatContext *s,
int nonkey=0; int nonkey=0;
if(st->nb_index_entries){ if(st->nb_index_entries){
assert(st->index_entries); av_assert0(st->index_entries);
ie= &st->index_entries[st->nb_index_entries-1]; ie= &st->index_entries[st->nb_index_entries-1];
if ((ret = avio_seek(s->pb, ie->pos, SEEK_SET)) < 0) if ((ret = avio_seek(s->pb, ie->pos, SEEK_SET)) < 0)
return ret; return ret;

Write Preview
Loading…
Cancel
Save