virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

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

Originally committed as revision 19140 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2009-06-09 20:58:32 +00:00
parent 28b80940ff
commit 277a28e8fc
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/asf.h
View File

@ -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 */

19
libavformat/asfdec.c
View File

@ -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){
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;