diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-01-21 19:18:08 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-23 19:32:06 +0100 |
| commit | 6e89b61293f8c1020e0346f1e1860bd642ce38e0 (patch) | |
| tree | 95d848b5c30536845717346f5bb148f3343db823 /libavformat/asfenc.c | |
| parent | e910a77b0d203870253eaa8ec43527560221268d (diff) | |
lavf: move ff_put_str16_nolen from asf to avio and rename it
It will be useful in the mp3 muxer.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dccbd97d72991f4df63542e1ee03db2f8d7a0238)
Diffstat (limited to 'libavformat/asfenc.c')
| -rw-r--r-- | libavformat/asfenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index b964953b2b..0c2a6ae94a 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -211,7 +211,7 @@ static void put_str16(ByteIOContext *s, const char *tag) if (url_open_dyn_buf(&dyn_buf) < 0) return; - ff_put_str16_nolen(dyn_buf, tag); + avio_put_str16le(dyn_buf, tag); len = url_close_dyn_buf(dyn_buf, &pb); put_le16(s, len); put_buffer(s, pb, len); @@ -346,7 +346,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data hpos = put_header(pb, &ff_asf_comment_header); for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) { - len = tags[n] ? ff_put_str16_nolen(dyn_buf, tags[n]->value) : 0; + len = tags[n] ? avio_put_str16le(dyn_buf, tags[n]->value) : 0; put_le16(pb, len); } len = url_close_dyn_buf(dyn_buf, &buf); @@ -474,7 +474,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data if ( url_open_dyn_buf(&dyn_buf) < 0) return AVERROR(ENOMEM); - ff_put_str16_nolen(dyn_buf, desc); + avio_put_str16le(dyn_buf, desc); len = url_close_dyn_buf(dyn_buf, &buf); put_le16(pb, len / 2); // "number of characters" = length in bytes / 2 |