diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-09-05 23:15:33 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-09-05 23:18:07 +0200 |
| commit | 9d9f34a3c1adcb75e6a25855f4ba78a71ea77b68 (patch) | |
| tree | 754c2756ab3e33ea3704e9a25fd1ba96f99b9db5 | |
| parent | e60fcdb989856db58e9481773f3e56fb0ddc16d4 (diff) | |
| download | ffmpeg-streaming-9d9f34a3c1adcb75e6a25855f4ba78a71ea77b68.zip ffmpeg-streaming-9d9f34a3c1adcb75e6a25855f4ba78a71ea77b68.tar.gz | |
lavf: remove a few useless AV_NOWARN_DEPRECATED().
read_seek was undeprecated in e5c708151.
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 0 insertions, 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 } |
