diff options
| author | jbrjake <[email protected]> | 2008-01-15 16:02:07 +0000 |
|---|---|---|
| committer | jbrjake <[email protected]> | 2008-01-15 16:02:07 +0000 |
| commit | 91379c8f6c840491ddb7b0ac432a2630164bc6c5 (patch) | |
| tree | bc7d18b512f92f436ab7c64caefa43d23983ad3a | |
| parent | 21a04aceecd10b9c2039e900ad9a2cca5353ae3e (diff) | |
Bumps libhb's copy of libmkv to 0.6.1.3, fixing the >2GB file crashes in Linux.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1200 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/version_libmkv.txt | 2 | ||||
| -rw-r--r-- | libhb/muxmkv.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/contrib/version_libmkv.txt b/contrib/version_libmkv.txt index 8ca77e188..fee43491c 100644 --- a/contrib/version_libmkv.txt +++ b/contrib/version_libmkv.txt @@ -1 +1 @@ -http://download.m0k.org/handbrake/contrib/libmkv-0.6.1.2.tar.gz +http://download.m0k.org/handbrake/contrib/libmkv-0.6.1.3.tar.gz diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c index 1f5d4ae48..856554cd7 100644 --- a/libhb/muxmkv.c +++ b/libhb/muxmkv.c @@ -112,16 +112,16 @@ static int MKVInit( hb_mux_object_t * m ) return 0; } - track->video.pixelWidth = job->width; - track->video.pixelHeight = job->height; - track->video.displayHeight = job->height; + track->extra.video.pixelWidth = job->width; + track->extra.video.pixelHeight = job->height; + track->extra.video.displayHeight = job->height; if(job->pixel_ratio) { - track->video.displayWidth = job->width * ((double)job->pixel_aspect_width / (double)job->pixel_aspect_height); + track->extra.video.displayWidth = job->width * ((double)job->pixel_aspect_width / (double)job->pixel_aspect_height); } else { - track->video.displayWidth = job->width; + track->extra.video.displayWidth = job->width; } @@ -191,8 +191,8 @@ static int MKVInit( hb_mux_object_t * m ) track->flagEnabled = 1; track->trackType = MK_TRACK_AUDIO; track->language = audio->iso639_2; - track->audio.samplingFreq = (float)job->arate; - track->audio.channels = (job->acodec == HB_ACODEC_AC3) ? HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->input_channel_layout) : HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->amixdown); + track->extra.audio.samplingFreq = (float)job->arate; + track->extra.audio.channels = (job->acodec == HB_ACODEC_AC3) ? HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->input_channel_layout) : HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->amixdown); // track->defaultDuration = job->arate * 1000; mux_data->track = mk_createTrack(m->file, track); if (job->acodec == HB_ACODEC_VORBIS && track->codecPrivate != NULL) |