generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flvdec: remove incomplete, disabled seeking code

Browse Source
This commit is contained in:
Ronald S. Bultje
2012-06-18 15:22:15 +01:00
committed by Mans Rullgard
parent 51a2b5546b
commit 8703f0140f
1 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libavformat/flvdec.c
View File

@@ -749,33 +749,6 @@ static int flv_read_seek(AVFormatContext *s, int stream_index,
return avio_seek_time(s->pb, stream_index, ts, flags); 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 = { AVInputFormat ff_flv_demuxer = {
.name = "flv", .name = "flv",
.long_name = NULL_IF_CONFIG_SMALL("FLV format"), .long_name = NULL_IF_CONFIG_SMALL("FLV format"),
@@ -784,9 +757,6 @@ AVInputFormat ff_flv_demuxer = {
.read_header = flv_read_header, .read_header = flv_read_header,
.read_packet = flv_read_packet, .read_packet = flv_read_packet,
.read_seek = flv_read_seek, .read_seek = flv_read_seek,
#if 0
.read_seek2 = flv_read_seek2,
#endif
.read_close = flv_read_close, .read_close = flv_read_close,
.extensions = "flv", .extensions = "flv",
}; };