Mercurial > libavformat.hg
changeset 2428:54f89ce33554 libavformat
Get rid of put_ebml_utf8(); the error checking that would have distinguished it from put_ebml_string() belongs elsewhere in lavf.
| author | conrad |
|---|---|
| date | Wed, 05 Sep 2007 00:22:43 +0000 |
| parents | 407d3205f02d |
| children | 326e6fcf9f85 |
| files | matroskaenc.c |
| diffstat | 1 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/matroskaenc.c Wed Sep 05 00:22:41 2007 +0000 +++ b/matroskaenc.c Wed Sep 05 00:22:43 2007 +0000 @@ -75,17 +75,11 @@ put_buffer(pb, buf, size); } -// XXX: should we do any special checking for valid strings for these 2 functions? static void put_ebml_string(ByteIOContext *pb, unsigned int elementid, char *str) { put_ebml_binary(pb, elementid, str, strlen(str)); } -static void put_ebml_utf8(ByteIOContext *pb, unsigned int elementid, char *str) -{ - put_ebml_binary(pb, elementid, str, strlen(str)); -} - static offset_t start_ebml_master(ByteIOContext *pb, unsigned int elementid) { put_ebml_id(pb, elementid); @@ -127,11 +121,11 @@ segment_info = start_ebml_master(pb, MATROSKA_ID_INFO); put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000); if (strlen(s->title)) - put_ebml_utf8(pb, MATROSKA_ID_TITLE, s->title); + put_ebml_string(pb, MATROSKA_ID_TITLE, s->title); if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { - put_ebml_utf8(pb, MATROSKA_ID_MUXINGAPP, LIBAVFORMAT_IDENT); + put_ebml_string(pb, MATROSKA_ID_MUXINGAPP, LIBAVFORMAT_IDENT); // XXX: both are required; something better for writing app? - put_ebml_utf8(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); + put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); } // XXX: segment UID and duration end_ebml_master(pb, segment_info);