[FFmpeg-cvslog] lavf: remove a few useless AV_NOWARN_DEPRECATED().
Clément Bœsch
git at videolan.org
Wed Sep 5 23:18:23 CEST 2012
ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Wed Sep 5 23:15:33 2012 +0200| [9d9f34a3c1adcb75e6a25855f4ba78a71ea77b68] | committer: Clément Bœsch
lavf: remove a few useless AV_NOWARN_DEPRECATED().
read_seek was undeprecated in e5c708151.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d9f34a3c1adcb75e6a25855f4ba78a71ea77b68
---
libavformat/utils.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 4ce0a0c..90455aa 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1926,12 +1926,10 @@ static int seek_frame_generic(AVFormatContext *s,
return -1;
ff_read_frame_flush(s);
- AV_NOWARN_DEPRECATED(
if (s->iformat->read_seek){
if(s->iformat->read_seek(s, stream_index, timestamp, flags) >= 0)
return 0;
}
- )
ie = &st->index_entries[index];
if ((ret = avio_seek(s->pb, ie->pos, SEEK_SET)) < 0)
return ret;
@@ -1964,13 +1962,11 @@ static int seek_frame_internal(AVFormatContext *s, int stream_index,
}
/* first, we try the format specific seek */
- AV_NOWARN_DEPRECATED(
if (s->iformat->read_seek) {
ff_read_frame_flush(s);
ret = s->iformat->read_seek(s, stream_index, timestamp, flags);
} else
ret = -1;
- )
if (ret >= 0) {
return 0;
}
@@ -2017,7 +2013,6 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int
//Fallback to old API if new is not implemented but old is
//Note the old has somewat different sematics
- AV_NOWARN_DEPRECATED(
if (s->iformat->read_seek || 1) {
int dir = (ts - min_ts > (uint64_t)(max_ts - ts) ? AVSEEK_FLAG_BACKWARD : 0);
int ret = av_seek_frame(s, stream_index, ts, flags | dir);
@@ -2028,7 +2023,6 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int
}
return ret;
}
- )
// try some generic seek like seek_frame_generic() but with new ts semantics
}
More information about the ffmpeg-cvslog
mailing list