Mercurial > libavformat.hg
changeset 5883:fd37c39041cd libavformat
Add a lowercase parameter to ff_data_to_hex
| author | mstorsjo |
|---|---|
| date | Thu, 25 Mar 2010 07:13:20 +0000 |
| parents | 005108a85bc3 |
| children | 416041cfd600 |
| files | internal.h rdt.c sdp.c utils.c |
| diffstat | 4 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/internal.h Wed Mar 24 23:06:58 2010 +0000 +++ b/internal.h Thu Mar 25 07:13:20 2010 +0000 @@ -24,7 +24,7 @@ #include <stdint.h> #include "avformat.h" -char *ff_data_to_hex(char *buf, const uint8_t *src, int size); +char *ff_data_to_hex(char *buf, const uint8_t *src, int size, int lowercase); void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
--- a/rdt.c Wed Mar 24 23:06:58 2010 +0000 +++ b/rdt.c Thu Mar 25 07:13:20 2010 +0000 @@ -120,8 +120,7 @@ buf[8 + i] ^= xor_table[i]; av_md5_sum(zres, buf, 64); - ff_data_to_hex(response, zres, 16); - for (i=0;i<32;i++) response[i] = tolower(response[i]); + ff_data_to_hex(response, zres, 16, 1); /* add tail */ strcpy (response + 32, "01d0a8e3");
--- a/sdp.c Wed Mar 24 23:06:58 2010 +0000 +++ b/sdp.c Thu Mar 25 07:13:20 2010 +0000 @@ -201,7 +201,7 @@ return NULL; } memcpy(config, "; config=", 9); - ff_data_to_hex(config + 9, c->extradata, c->extradata_size); + ff_data_to_hex(config + 9, c->extradata, c->extradata_size, 0); config[9 + c->extradata_size * 2] = 0; return config;
--- a/utils.c Wed Mar 24 23:06:58 2010 +0000 +++ b/utils.c Thu Mar 25 07:13:20 2010 +0000 @@ -3464,13 +3464,18 @@ } } -char *ff_data_to_hex(char *buff, const uint8_t *src, int s) +char *ff_data_to_hex(char *buff, const uint8_t *src, int s, int lowercase) { int i; - static const char hex_table[16] = { '0', '1', '2', '3', + static const char hex_table_uc[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; + static const char hex_table_lc[16] = { '0', '1', '2', '3', + '4', '5', '6', '7', + '8', '9', 'a', 'b', + 'c', 'd', 'e', 'f' }; + const char *hex_table = lowercase ? hex_table_lc : hex_table_uc; for(i = 0; i < s; i++) { buff[i * 2] = hex_table[src[i] >> 4];