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/rtmppkt.c | |
| parent | dbcf7e9ef7f88c7ffb4894622223e014dac1621c (diff) | |
| parent | e926b5ceb1962833f0c884a328382bc2eca67aff (diff) | |
| download | ffmpeg-a5ba4e186bcb44c60f215e1367e3d5269b564cea.tar.gz | |
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/rtmppkt.c')
| -rw-r--r-- | libavformat/rtmppkt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c index 3bd28eb614..c2015a5412 100644 --- a/libavformat/rtmppkt.c +++ b/libavformat/rtmppkt.c @@ -438,7 +438,8 @@ static const char* rtmp_packet_type(int type) } } -static void ff_amf_tag_contents(void *ctx, const uint8_t *data, const uint8_t *data_end) +static void amf_tag_contents(void *ctx, const uint8_t *data, + const uint8_t *data_end) { unsigned int size; char buf[1024]; @@ -484,7 +485,7 @@ static void ff_amf_tag_contents(void *ctx, const uint8_t *data, const uint8_t *d return; data += size; av_log(ctx, AV_LOG_DEBUG, " %s: ", buf); - ff_amf_tag_contents(ctx, data, data_end); + amf_tag_contents(ctx, data, data_end); t = ff_amf_tag_size(data, data_end); if (t < 0 || t >= data_end - data) return; @@ -507,7 +508,7 @@ void ff_rtmp_packet_dump(void *ctx, RTMPPacket *p) uint8_t *src = p->data, *src_end = p->data + p->data_size; while (src < src_end) { int sz; - ff_amf_tag_contents(ctx, src, src_end); + amf_tag_contents(ctx, src, src_end); sz = ff_amf_tag_size(src, src_end); if (sz < 0) break; |