diff options
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/module.defs | 4 | ||||
| -rw-r--r-- | libhb/muxmp4.c | 26 |
2 files changed, 17 insertions, 13 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index e5ecf9722..17efc31ff 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -1,6 +1,6 @@ __deps__ := A52DEC BZIP2 FAAC FAAD2 FFMPEG LAME LIBDCA \ - LIBDVDREAD LIBDVDNAV LIBMKV LIBMP4V2 LIBOGG LIBSAMPLERATE LIBTHEORA \ - LIBVORBIS MPEG2DEC PTHREADW32 X264 XVIDCORE ZLIB + LIBDVDREAD LIBDVDNAV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS \ + MP4V2 MPEG2DEC PTHREADW32 X264 XVIDCORE ZLIB $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__))) $(eval $(call import.GCC,LIBHB)) diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c index dadfcdd62..1511713b3 100644 --- a/libhb/muxmp4.c +++ b/libhb/muxmp4.c @@ -420,7 +420,7 @@ static int MP4Init( hb_mux_object_t * m ) subtitle->mux_data = mux_data; mux_data->subtitle = 1; mux_data->sub_format = subtitle->format; - mux_data->track = MP4AddSubtitleTrack( m->file, 1 ); + mux_data->track = MP4AddSubtitleTrack( m->file, 90000, width, height ); MP4SetTrackLanguage(m->file, mux_data->track, subtitle->iso639_2); @@ -431,9 +431,6 @@ static int MP4Init( hb_mux_object_t * m ) MP4SetTrackIntegerProperty(m->file, mux_data->track, "tkhd.alternate_group", 2); - MP4SetTrackFloatProperty(m->file, mux_data->track, "tkhd.width", width); - MP4SetTrackFloatProperty(m->file, mux_data->track, "tkhd.height", height); - MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.dataReferenceIndex", 1); MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.horizontalJustification", 1); MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.verticalJustification", 0); @@ -768,13 +765,20 @@ static int MP4End( hb_mux_object_t * m ) MP4TagsFetch( tags, m->file ); /* populate */ - MP4TagsSetName( tags, md->name ); - MP4TagsSetArtist( tags, md->artist ); - MP4TagsSetComposer( tags, md->composer ); - MP4TagsSetComments( tags, md->comment ); - MP4TagsSetReleaseDate( tags, md->release_date ); - MP4TagsSetAlbum( tags, md->album ); - MP4TagsSetGenre( tags, md->genre ); + if( strlen( md->name )) + MP4TagsSetName( tags, md->name ); + if( strlen( md->artist )) + MP4TagsSetArtist( tags, md->artist ); + if( strlen( md->composer )) + MP4TagsSetComposer( tags, md->composer ); + if( strlen( md->comment )) + MP4TagsSetComments( tags, md->comment ); + if( strlen( md->release_date )) + MP4TagsSetReleaseDate( tags, md->release_date ); + if( strlen( md->album )) + MP4TagsSetAlbum( tags, md->album ); + if( strlen( md->genre )) + MP4TagsSetGenre( tags, md->genre ); if( md->coverart ) { |