Mercurial > libavformat.hg
diff asfenc.c @ 5876:2c0f0162a110 libavformat
Move put_le16_nolen() to asf.c and give it a ff_ prefix. This way, it is easier
to share it with e.g. MMS.
Patch by Zhentan Feng <spyfeng gmail com>.
author | rbultje |
---|---|
date | Wed, 24 Mar 2010 18:40:43 +0000 |
parents | d833557e7287 |
children | 536e5527c1e0 |
line wrap: on
line diff
--- a/asfenc.c Wed Mar 24 11:11:25 2010 +0000 +++ b/asfenc.c Wed Mar 24 18:40:43 2010 +0000 @@ -203,23 +203,6 @@ put_buffer(s, *g, sizeof(*g)); } -static int put_str16_nolen(ByteIOContext *s, const char *tag) -{ - const uint8_t *q = tag; - int ret = 0; - - while (*q) { - uint32_t ch; - uint16_t tmp; - - GET_UTF8(ch, *q++, break;) - PUT_UTF16(ch, tmp, put_le16(s, tmp);ret += 2;) - } - put_le16(s, 0); - ret += 2; - return ret; -} - static void put_str16(ByteIOContext *s, const char *tag) { int len; @@ -228,7 +211,7 @@ if (url_open_dyn_buf(&dyn_buf) < 0) return; - put_str16_nolen(dyn_buf, tag); + ff_put_str16_nolen(dyn_buf, tag); len = url_close_dyn_buf(dyn_buf, &pb); put_le16(s, len); put_buffer(s, pb, len); @@ -361,7 +344,7 @@ hpos = put_header(pb, &ff_asf_comment_header); for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) { - len = tags[n] ? put_str16_nolen(dyn_buf, tags[n]->value) : 0; + len = tags[n] ? ff_put_str16_nolen(dyn_buf, tags[n]->value) : 0; put_le16(pb, len); } len = url_close_dyn_buf(dyn_buf, &buf); @@ -489,7 +472,7 @@ if ( url_open_dyn_buf(&dyn_buf) < 0) return AVERROR(ENOMEM); - put_str16_nolen(dyn_buf, desc); + ff_put_str16_nolen(dyn_buf, desc); len = url_close_dyn_buf(dyn_buf, &buf); put_le16(pb, len / 2); // "number of characters" = length in bytes / 2