RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Get rid of put_ebml_utf8(); the error checking that would have distinguished it from put_ebml_string() belongs elsewhere in lavf. 

Originally committed as revision 10297 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2007-09-05 00:22:43 +00:00
parent dbf653f766
commit 81efc03f58
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/matroskaenc.c
View File

@ -75,17 +75,11 @@ static void put_ebml_binary(ByteIOContext *pb, unsigned int elementid,
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 @@ static int mkv_write_header(AVFormatContext *s)
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);