[FFmpeg-devel] [PATCH] asfdec.c: make get/parse_packet static

[Ronald S. Bultje]

Hi,

as per $subj and request of Michael.

Ronald
-------------- next part --------------
Index: ffmpeg-svn/libavformat/asf.h
===================================================================
--- ffmpeg-svn.orig/libavformat/asf.h	2009-04-22 08:18:03.000000000 -0400
+++ ffmpeg-svn/libavformat/asf.h	2009-04-22 08:56:30.000000000 -0400
@@ -222,23 +222,4 @@
 
 extern AVInputFormat asf_demuxer;
 
-/**
- * Load a single ASF packet into the demuxer.
- * @param s demux context
- * @param pb context to read data from
- * @returns 0 on success, <0 on error
- */
-int ff_asf_get_packet(AVFormatContext *s, ByteIOContext *pb);
-
-/**
- * Parse data from individual ASF packets (which were previously loaded
- * with asf_get_packet()).
- * @param s demux context
- * @param pb context to read data from
- * @param pkt pointer to store packet data into
- * @returns 0 if data was stored in pkt, <0 on error or 1 if more ASF
- *          packets need to be loaded (through asf_get_packet())
- */
-int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt);
-
 #endif /* AVFORMAT_ASF_H */
Index: ffmpeg-svn/libavformat/asfdec.c
===================================================================
--- ffmpeg-svn.orig/libavformat/asfdec.c	2009-04-22 08:55:24.000000000 -0400
+++ ffmpeg-svn/libavformat/asfdec.c	2009-04-22 08:57:03.000000000 -0400
@@ -552,7 +552,13 @@
     default: var = defval; break; \
     }
 
-int ff_asf_get_packet(AVFormatContext *s, ByteIOContext *pb)
+/**
+ * Load a single ASF packet into the demuxer.
+ * @param s demux context
+ * @param pb context to read data from
+ * @returns 0 on success, <0 on error
+ */
+static int ff_asf_get_packet(AVFormatContext *s, ByteIOContext *pb)
 {
     ASFContext *asf = s->priv_data;
     uint32_t packet_length, padsize;
@@ -696,7 +702,16 @@
     return 0;
 }
 
-int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt)
+/**
+ * Parse data from individual ASF packets (which were previously loaded
+ * with asf_get_packet()).
+ * @param s demux context
+ * @param pb context to read data from
+ * @param pkt pointer to store packet data into
+ * @returns 0 if data was stored in pkt, <0 on error or 1 if more ASF
+ *          packets need to be loaded (through asf_get_packet())
+ */
+static int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt)
 {
     ASFContext *asf = s->priv_data;
     ASFStream *asf_st = 0;