summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreddyg <[email protected]>2009-01-20 05:19:59 +0000
committereddyg <[email protected]>2009-01-20 05:19:59 +0000
commitcb23938da2747334ee19e359a64db9bb9eec4a55 (patch)
tree759b2bea7919ec28482614b37c500cfc5a962f4d
parentf0ad6d2972a9bbe7fa975591da6474c7980e2857 (diff)
Update libmkv and start writing mkv tags, no artwork as yet - haven't had time to do it, sorry. I also had a hard time testing that the tags work. But I could see that they were present in the file, and I could see that it didn't affect playability.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2090 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--contrib/version_libmkv.txt2
-rw-r--r--libhb/muxmkv.c14
2 files changed, 15 insertions, 1 deletions
diff --git a/contrib/version_libmkv.txt b/contrib/version_libmkv.txt
index 133af6541..b5f851c78 100644
--- a/contrib/version_libmkv.txt
+++ b/contrib/version_libmkv.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/libmkv-0.6.3.tar.gz
+http://download.m0k.org/handbrake/contrib/libmkv-0.6.3.1.tar.gz
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c
index 6217820b5..23d1b8aca 100644
--- a/libhb/muxmkv.c
+++ b/libhb/muxmkv.c
@@ -363,6 +363,20 @@ static int MKVEnd( hb_mux_object_t * m )
mk_createChapterSimple(m->file, mux_data->prev_chapter_tc, mux_data->prev_chapter_tc, string);
}
+ if( title->metadata )
+ {
+ hb_metadata_t *md = title->metadata;
+
+ hb_deep_log( 2, "Writing Metadata to output file...");
+ mk_createTagSimple( m->file, MK_TAG_TITLE, md->name );
+ mk_createTagSimple( m->file, "ARTIST", md->artist );
+ mk_createTagSimple( m->file, "COMPOSER", md->composer );
+ mk_createTagSimple( m->file, MK_TAG_SYNOPSIS, md->comment );
+ mk_createTagSimple( m->file, "DATE_RELEASED", md->release_date );
+ // mk_createTagSimple( m->file, "", md->album );
+ mk_createTagSimple( m->file, MK_TAG_GENRE, md->genre );
+ }
+
if( mk_close(m->file) < 0 )
{
hb_error( "Failed to flush the last frame and close the output file, Disk Full?" );