aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-10-14 17:44:38 +0000
committerDiego Biurrun <diego@biurrun.de>2007-10-14 17:44:38 +0000
commit5d25d2a9837dc143916546824886725035d816e7 (patch)
tree677c021892b81cde8d2eb7058689b2cd078d0ce9 /libavformat
parentfe0b9a6464d7edbfeb92ffac0d060b2643621f93 (diff)
downloadffmpeg-5d25d2a9837dc143916546824886725035d816e7.tar.gz
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
Originally committed as revision 10735 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/asf.c28
1 files changed, 13 insertions, 15 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c
index 4c99182480..2809f07188 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -878,21 +878,6 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
-static void asf_reset_header(AVFormatContext *s);
-
-static int asf_read_close(AVFormatContext *s)
-{
- int i;
-
- asf_reset_header(s);
- for(i=0;i<s->nb_streams;i++) {
- AVStream *st = s->streams[i];
- av_free(st->priv_data);
- av_free(st->codec->palctrl);
- }
- return 0;
-}
-
// Added to support seeking after packets have been read
// If information is not reset, read_packet fails due to
// leftover information from previous reads
@@ -931,6 +916,19 @@ static void asf_reset_header(AVFormatContext *s)
asf->asf_st= NULL;
}
+static int asf_read_close(AVFormatContext *s)
+{
+ int i;
+
+ asf_reset_header(s);
+ for(i=0;i<s->nb_streams;i++) {
+ AVStream *st = s->streams[i];
+ av_free(st->priv_data);
+ av_free(st->codec->palctrl);
+ }
+ return 0;
+}
+
static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, int64_t pos_limit)
{
ASFContext *asf = s->priv_data;