virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Use generic seeking code for flv. The removed code was a buggy duplicate.

Browse Source 
Originally committed as revision 12812 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-04-14 12:22:23 +00:00
parent 26d95a1ecf
commit 0366654e2b
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/flvdec.c
View File

@ -385,17 +385,6 @@ static int flv_read_close(AVFormatContext *s)
return 0;
}
static int flv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
{
AVStream *st = s->streams[stream_index];
int index = av_index_search_timestamp(st, timestamp, flags);
if (index < 0)
return -1;
url_fseek(s->pb, st->index_entries[index].pos, SEEK_SET);
return 0;
}
AVInputFormat flv_demuxer = {
"flv",
"flv format",
@ -404,7 +393,6 @@ AVInputFormat flv_demuxer = {
flv_read_header,
flv_read_packet,
flv_read_close,
flv_read_seek,
.extensions = "flv",
.value = CODEC_ID_FLV1,
};

10
tests/seek.regression.ref
View File

@ -210,7 +210,7 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1
ret: 0 st:-1 ts:-1.000000 flags:0
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1
ret: 0 st:-1 ts:1.894167 flags:1
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1
ret: 0 st: 0 dts:1.858000 pts:1.858000 pos:82944 size:2053 flags:1
ret: 0 st: 0 ts:0.788000 flags:0
ret: 0 st: 0 dts:0.789000 pts:0.789000 pos:35357 size:2053 flags:1
ret:-1 st: 0 ts:-0.317000 flags:1
@ -228,7 +228,7 @@ ret: 0 st: 0 dts:1.022000 pts:1.022000 pos:45702 size:2053 flags:1
ret: 0 st: 0 ts:-0.058000 flags:0
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1
ret: 0 st: 0 ts:2.836000 flags:1
ret: 0 st: 0 dts:2.601000 pts:2.601000 pos:116048 size:2053 flags:1
ret: 0 st: 0 dts:2.833000 pts:2.833000 pos:126393 size:2053 flags:1
ret: 0 st:-1 ts:1.730004 flags:0
ret: 0 st: 0 dts:1.765000 pts:1.765000 pos:78806 size:2053 flags:1
ret: 0 st:-1 ts:0.624171 flags:1
@ -647,7 +647,7 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:199 size:240780 flags:1
ret: 0 st:-1 ts:-1.000000 flags:0
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:199 size:240780 flags:1
ret: 0 st:-1 ts:1.894167 flags:1
ret: 0 st: 0 dts:0.800000 pts:0.800000 pos:4820523 size:245529 flags:1
ret: 0 st: 0 dts:1.880000 pts:1.880000 pos:11605692 size:254018 flags:1
ret: 0 st: 0 ts:0.788000 flags:0
ret: 0 st: 0 dts:0.800000 pts:0.800000 pos:4820523 size:245529 flags:1
ret:-1 st: 0 ts:-0.317000 flags:1
@ -695,7 +695,7 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:199 size:10380 flags:1
ret: 0 st:-1 ts:-1.000000 flags:0
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:199 size:10380 flags:1
ret: 0 st:-1 ts:1.894167 flags:1
ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:25960 size:10089 flags:1
ret: 0 st: 0 dts:1.440000 pts:1.440000 pos:83240 size:12295 flags:1
ret: 0 st: 0 ts:0.788000 flags:0
ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:52585 size:11127 flags:1
ret:-1 st: 0 ts:-0.317000 flags:1
@ -2889,7 +2889,7 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:199 size:31385 flags:1
ret: 0 st:-1 ts:-1.000000 flags:0
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:199 size:31385 flags:1
ret: 0 st:-1 ts:1.894167 flags:1
ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:150381 size:30541 flags:1
ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:304714 size:31115 flags:1
ret: 0 st: 0 ts:0.788000 flags:0
ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:304714 size:31115 flags:1
ret:-1 st: 0 ts:-0.317000 flags:1