Commit 277a28e8 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:

make get/parse_packet static" thread from 2 months ago.

Originally committed as revision 19140 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 28b80940
...@@ -227,23 +227,4 @@ extern const AVMetadataConv ff_asf_metadata_conv[]; ...@@ -227,23 +227,4 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
extern AVInputFormat asf_demuxer; 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 */ #endif /* AVFORMAT_ASF_H */
...@@ -582,7 +582,13 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -582,7 +582,13 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
default: var = defval; break; \ 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; ASFContext *asf = s->priv_data;
uint32_t packet_length, padsize; uint32_t packet_length, padsize;
...@@ -726,7 +732,16 @@ static int asf_read_frame_header(AVFormatContext *s, ByteIOContext *pb){ ...@@ -726,7 +732,16 @@ static int asf_read_frame_header(AVFormatContext *s, ByteIOContext *pb){
return 0; 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; ASFContext *asf = s->priv_data;
ASFStream *asf_st = 0; ASFStream *asf_st = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment