diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-06-18 15:22:15 +0100 |
---|---|---|
committer | Mans Rullgard <mans@mansr.com> | 2012-06-19 01:02:10 +0100 |
commit | 8703f0140f89bb761e9b158978aee51d90d5293d (patch) | |
tree | 9ab8df1257126f14b98b51ed86e0dc0605be97f9 | |
parent | 51a2b5546b29b113da4abd1cd9793c01e545da19 (diff) | |
download | ffmpeg-streaming-8703f0140f89bb761e9b158978aee51d90d5293d.zip ffmpeg-streaming-8703f0140f89bb761e9b158978aee51d90d5293d.tar.gz |
flvdec: remove incomplete, disabled seeking code
-rw-r--r-- | libavformat/flvdec.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index f04f4fe..8e9759b 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -749,33 +749,6 @@ static int flv_read_seek(AVFormatContext *s, int stream_index, return avio_seek_time(s->pb, stream_index, ts, flags); } -#if 0 /* don't know enough to implement this */ -static int flv_read_seek2(AVFormatContext *s, int stream_index, - int64_t min_ts, int64_t ts, int64_t max_ts, int flags) -{ - int ret = AVERROR(ENOSYS); - - if (ts - min_ts > (uint64_t)(max_ts - ts)) flags |= AVSEEK_FLAG_BACKWARD; - - if (!s->pb->seekable) { - if (stream_index < 0) { - stream_index = av_find_default_stream_index(s); - if (stream_index < 0) - return -1; - - /* timestamp for default must be expressed in AV_TIME_BASE units */ - ts = av_rescale_rnd(ts, 1000, AV_TIME_BASE, - flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP); - } - ret = avio_seek_time(s->pb, stream_index, ts, flags); - } - - if (ret == AVERROR(ENOSYS)) - ret = av_seek_frame(s, stream_index, ts, flags); - return ret; -} -#endif - AVInputFormat ff_flv_demuxer = { .name = "flv", .long_name = NULL_IF_CONFIG_SMALL("FLV format"), @@ -784,9 +757,6 @@ AVInputFormat ff_flv_demuxer = { .read_header = flv_read_header, .read_packet = flv_read_packet, .read_seek = flv_read_seek, -#if 0 - .read_seek2 = flv_read_seek2, -#endif .read_close = flv_read_close, .extensions = "flv", }; |