Mercurial > libavformat.hg
changeset 5011:5cf7e033989d libavformat
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
make get/parse_packet static" thread from 2 months ago.
| author | rbultje |
|---|---|
| date | Tue, 09 Jun 2009 20:58:32 +0000 |
| parents | 1983ca659d54 |
| children | 7734b5d0fc6c |
| files | asf.h asfdec.c |
| diffstat | 2 files changed, 17 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/asf.h Tue Jun 09 18:30:15 2009 +0000 +++ b/asf.h Tue Jun 09 20:58:32 2009 +0000 @@ -227,23 +227,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 */
--- a/asfdec.c Tue Jun 09 18:30:15 2009 +0000 +++ b/asfdec.c Tue Jun 09 20:58:32 2009 +0000 @@ -582,7 +582,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; @@ -726,7 +732,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;