summaryrefslogtreecommitdiff
path: root/libavformat/mmst.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-01-21 19:18:08 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-01-23 19:32:06 +0100
commit6e89b61293f8c1020e0346f1e1860bd642ce38e0 (patch)
tree95d848b5c30536845717346f5bb148f3343db823 /libavformat/mmst.c
parente910a77b0d203870253eaa8ec43527560221268d (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/mmst.c')
-rw-r--r--libavformat/mmst.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/mmst.c b/libavformat/mmst.c
index 57cca5d0d4..08e3b3e660 100644
--- a/libavformat/mmst.c
+++ b/libavformat/mmst.c
@@ -34,7 +34,6 @@
#include "libavutil/intreadwrite.h"
#include "libavcodec/bytestream.h"
#include "network.h"
-#include "asf.h"
#define LOCAL_ADDRESS 0xc0a80081 // FIXME get and use correct local ip address.
#define LOCAL_PORT 1037 // as above.
@@ -159,7 +158,7 @@ static void mms_put_utf16(MMSContext *mms, uint8_t *src)
init_put_byte(&bic, mms->write_out_ptr,
sizeof(mms->out_buffer) - size, 1, NULL, NULL, NULL, NULL);
- len = ff_put_str16_nolen(&bic, src);
+ len = avio_put_str16le(&bic, src);
mms->write_out_ptr += len;
}