From 979b1a0611e932b94ad6d7fb7c77a9f5ea7012c0 Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Mon, 26 May 2008 03:47:07 +0000
Subject: [PATCH] move get_pts function to avoid useless declaration
Originally committed as revision 13415 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/ffmdec.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 706aa7d0198..e7998ee9968 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -23,8 +23,6 @@
#include "ffm.h"
#include <unistd.h>
-static int64_t get_pts(AVFormatContext *s, offset_t pos);
-
static int ffm_is_avail_data(AVFormatContext *s, int size)
{
FFMContext *ffm = s->priv_data;
@@ -109,6 +107,19 @@ static int ffm_read_data(AVFormatContext *s,
return size1 - size;
}
+static int64_t get_pts(AVFormatContext *s, offset_t pos)
+{
+ ByteIOContext *pb = s->pb;
+ int64_t pts;
+
+ ffm_seek1(s, pos);
+ url_fskip(pb, 4);
+ pts = get_be64(pb);
+#ifdef DEBUG_SEEK
+ printf("pts=%0.6f\n", pts / 1000000.0);
+#endif
+ return pts;
+}
static void adjust_write_index(AVFormatContext *s)
{
@@ -376,20 +387,6 @@ static void ffm_seek1(AVFormatContext *s, offset_t pos1)
url_fseek(pb, pos, SEEK_SET);
}
-static int64_t get_pts(AVFormatContext *s, offset_t pos)
-{
- ByteIOContext *pb = s->pb;
- int64_t pts;
-
- ffm_seek1(s, pos);
- url_fskip(pb, 4);
- pts = get_be64(pb);
-#ifdef DEBUG_SEEK
- printf("pts=%0.6f\n", pts / 1000000.0);
-#endif
- return pts;
-}
-
/* 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 */
--
GitLab