diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2008-08-27 23:43:28 +0000 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2008-08-27 23:43:28 +0000 |
commit | f1c80e35783e910f5fe5ce643645029a7e517c8f (patch) | |
tree | c9ca090aeb778a68a8f36e9428e238a5c4a1e666 /libavformat/sdp.c | |
parent | aec0407fafe831c8a72289576fb5f37ee44f52f6 (diff) | |
download | ffmpeg-streaming-f1c80e35783e910f5fe5ce643645029a7e517c8f.zip ffmpeg-streaming-f1c80e35783e910f5fe5ce643645029a7e517c8f.tar.gz |
Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
move it from sdp.c into utils.c. Also add new header internal.h specifically
for lavf-specific internal API. See discussion in "Realmedia patch" thread
on mailinglist.
Originally committed as revision 15002 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/sdp.c')
-rw-r--r-- | libavformat/sdp.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c index f9c0582..dfbe52e 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -21,6 +21,7 @@ #include "libavutil/avstring.h" #include "libavutil/base64.h" #include "avformat.h" +#include "internal.h" #include "avc.h" #include "rtp.h" @@ -135,27 +136,6 @@ static char *extradata2psets(AVCodecContext *c) return psets; } -static void digit_to_char(char *dst, uint8_t src) -{ - if (src < 10) { - *dst = '0' + src; - } else { - *dst = 'A' + src - 10; - } -} - -static char *data_to_hex(char *buff, const uint8_t *src, int s) -{ - int i; - - for(i = 0; i < s; i++) { - digit_to_char(buff + 2 * i, src[i] >> 4); - digit_to_char(buff + 2 * i + 1, src[i] & 0xF); - } - - return buff; -} - static char *extradata2config(AVCodecContext *c) { char *config; @@ -171,7 +151,7 @@ static char *extradata2config(AVCodecContext *c) return NULL; } memcpy(config, "; config=", 9); - data_to_hex(config + 9, c->extradata, c->extradata_size); + ff_data_to_hex(config + 9, c->extradata, c->extradata_size); config[9 + c->extradata_size * 2] = 0; return config; |