[FFmpeg-cvslog] r19140 - in trunk/libavformat: asf.h asfdec.c

[rbultje]

Author: rbultje
Date: Tue Jun  9 22:58:32 2009
New Revision: 19140

Log:
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
make get/parse_packet static" thread from 2 months ago.

Modified:
   trunk/libavformat/asf.h
   trunk/libavformat/asfdec.c

Modified: trunk/libavformat/asf.h
==============================================================================
--- trunk/libavformat/asf.h	Tue Jun  9 22:29:52 2009	(r19139)
+++ trunk/libavformat/asf.h	Tue Jun  9 22:58:32 2009	(r19140)
@@ -227,23 +227,4 @@ extern const AVMetadataConv ff_asf_metad
 
 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 */

Modified: trunk/libavformat/asfdec.c
==============================================================================
--- trunk/libavformat/asfdec.c	Tue Jun  9 22:29:52 2009	(r19139)
+++ trunk/libavformat/asfdec.c	Tue Jun  9 22:58:32 2009	(r19140)
@@ -582,7 +582,13 @@ static int asf_read_header(AVFormatConte
     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;
@@ -726,7 +732,16 @@ static int asf_read_frame_header(AVForma
     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;