From 566fb1b3eb040d268f5d546778b665271194aabb Mon Sep 17 00:00:00 2001 From: randomengy Date: Sat, 13 Aug 2011 01:53:01 +0000 Subject: Interop: Struct changes to keep up with libhb and passthrough updates. Also fixing a problem where the audio passthrough mask wasn't applied when creating the passthrough codec value. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4171 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs') diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs index 28afc8462..2ea3a2ca2 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs @@ -1329,10 +1329,12 @@ namespace HandBrake.Interop if (encoding.Encoder == AudioEncoder.Passthrough) { // If we've been given a general "Passthrough" codec, see if it's valid for this input track. - if ((baseStruct.config.input.codec & NativeConstants.HB_ACODEC_PASS_MASK) > 0) + uint audioCodec = baseStruct.config.input.codec & NativeConstants.HB_ACODEC_PASS_MASK; + if (audioCodec > 0) { // We can do passthrough for this input. - nativeAudio.config.output.codec = nativeAudio.config.input.codec | NativeConstants.HB_ACODEC_PASS_FLAG; + //nativeAudio.config.output.codec = NativeConstants.HB_ACODEC_PASS_MASK | NativeConstants.HB_ACODEC_PASS_FLAG; + nativeAudio.config.output.codec = audioCodec | NativeConstants.HB_ACODEC_PASS_FLAG; } else { -- cgit v1.2.3