diff options
| author | Rodeo <[email protected]> | 2013-01-02 21:44:38 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-01-02 21:44:38 +0000 |
| commit | a2a844aaf85c003320170d446adcdb14e05317cc (patch) | |
| tree | a376b4ada55ddc3ffd91d8491a5e42ba165dde63 /libhb/muxmkv.c | |
| parent | 036e9b30ce75ebe78ad8c6e4ce5de7cf6c12777f (diff) | |
FLAC: add 24-bit encoding.
Works via a dedicated encoder: "FLAC (24-bit)", "ffflac24".
Users who prefer 16-bit can use the previous FLAC encoder: "FLAC (ffmpeg)", "ffflac".
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5134 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/muxmkv.c')
| -rw-r--r-- | libhb/muxmkv.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c index 735bb631e..e45ebb126 100644 --- a/libhb/muxmkv.c +++ b/libhb/muxmkv.c @@ -247,11 +247,11 @@ static int MKVInit( hb_mux_object_t * m ) } break; case HB_ACODEC_FFFLAC: - if( audio->priv.config.extradata.bytes ) + case HB_ACODEC_FFFLAC24: + if (audio->priv.config.extradata.bytes) { - track->codecPrivate = create_flac_header( - audio->priv.config.extradata.bytes, - audio->priv.config.extradata.length ); + track->codecPrivate = create_flac_header(audio->priv.config.extradata.bytes, + audio->priv.config.extradata.length); track->codecPrivateSize = audio->priv.config.extradata.length + 8; } track->codecID = MK_ACODEC_FLAC; @@ -307,9 +307,10 @@ static int MKVInit( hb_mux_object_t * m ) track->extra.audio.channels = hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown); } mux_data->track = mk_createTrack(m->file, track); - if( audio->config.out.codec == HB_ACODEC_VORBIS || - audio->config.out.codec == HB_ACODEC_FFFLAC ) - free( track->codecPrivate ); + if (audio->config.out.codec == HB_ACODEC_VORBIS || + audio->config.out.codec == HB_ACODEC_FFFLAC || + audio->config.out.codec == HB_ACODEC_FFFLAC24) + free(track->codecPrivate); } char * subidx_fmt = |