# HG changeset patch # User bcoudurier # Date 1211773825 0 # Node ID 10fe58a8cc8bc13bccd98b6951025de3faa8fb21 # Parent 6063f3cf59e619f300a6d65bd6c39da538959b5a move ffm_seek1 before get_pts function since func uses it diff -r 6063f3cf59e6 -r 10fe58a8cc8b ffmdec.c --- a/ffmdec.c Mon May 26 03:47:56 2008 +0000 +++ b/ffmdec.c Mon May 26 03:50:25 2008 +0000 @@ -109,6 +109,23 @@ //#define DEBUG_SEEK +/* pos is between 0 and file_size - FFM_PACKET_SIZE. It is translated + by the write position inside this function */ +static void ffm_seek1(AVFormatContext *s, offset_t pos1) +{ + FFMContext *ffm = s->priv_data; + ByteIOContext *pb = s->pb; + offset_t pos; + + pos = pos1 + ffm->write_index; + if (pos >= ffm->file_size) + pos -= (ffm->file_size - FFM_PACKET_SIZE); +#ifdef DEBUG_SEEK + printf("seek to %"PRIx64" -> %"PRIx64"\n", pos1, pos); +#endif + url_fseek(pb, pos, SEEK_SET); +} + static int64_t get_pts(AVFormatContext *s, offset_t pos) { ByteIOContext *pb = s->pb; @@ -370,23 +387,6 @@ return 0; } -/* pos is between 0 and file_size - FFM_PACKET_SIZE. It is translated - by the write position inside this function */ -static void ffm_seek1(AVFormatContext *s, offset_t pos1) -{ - FFMContext *ffm = s->priv_data; - ByteIOContext *pb = s->pb; - offset_t pos; - - pos = pos1 + ffm->write_index; - if (pos >= ffm->file_size) - pos -= (ffm->file_size - FFM_PACKET_SIZE); -#ifdef DEBUG_SEEK - printf("seek to %"PRIx64" -> %"PRIx64"\n", pos1, pos); -#endif - url_fseek(pb, pos, SEEK_SET); -} - /* seek to a given time in the file. The file read pointer is positioned at or before pts. XXX: the following code is quite approximative */