diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:28:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:28:48 +0200 |
| commit | a5ba4e186bcb44c60f215e1367e3d5269b564cea (patch) | |
| tree | 0322f254e35dda891f4f4c1ba35146d1f66b798c /libavformat/asfdec.c | |
| parent | dbcf7e9ef7f88c7ffb4894622223e014dac1621c (diff) | |
| parent | e926b5ceb1962833f0c884a328382bc2eca67aff (diff) | |
Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'
* commit 'e926b5ceb1962833f0c884a328382bc2eca67aff':
avformat: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavformat/audiointerleave.c
libavformat/mux.c
libavformat/mxfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfdec.c')
| -rw-r--r-- | libavformat/asfdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 1d7f26cefe..b2358a7760 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -883,7 +883,7 @@ static int asf_read_header(AVFormatContext *s) * @param pb context to read data from * @return 0 on success, <0 on error */ -static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) +static int asf_get_packet(AVFormatContext *s, AVIOContext *pb) { ASFContext *asf = s->priv_data; uint32_t packet_length, padsize; @@ -1110,7 +1110,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) * @return 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, AVIOContext *pb, AVPacket *pkt) +static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) { ASFContext *asf = s->priv_data; ASFStream *asf_st = 0; @@ -1331,9 +1331,9 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) int ret; /* parse cached packets, if any */ - if ((ret = ff_asf_parse_packet(s, s->pb, pkt)) <= 0) + if ((ret = asf_parse_packet(s, s->pb, pkt)) <= 0) return ret; - if ((ret = ff_asf_get_packet(s, s->pb)) < 0) + if ((ret = asf_get_packet(s, s->pb)) < 0) assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1); asf->packet_time_start = 0; |