]> granicus.if.org Git - handbrake/commitdiff
LinGui: merge fix for fallback audio encoder selection to bugfix branch
authorjstebbins <jstebbins.hb@gmail.com>
Fri, 27 Apr 2012 17:42:45 +0000 (17:42 +0000)
committerjstebbins <jstebbins.hb@gmail.com>
Fri, 27 Apr 2012 17:42:45 +0000 (17:42 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.9.x@4608 b64f7644-9d1e-0410-96f1-a4d463321fa5

gtk/src/audiohandler.c

index 52c5f8599536db8df8d72f460b4cbf1c6c2d2ca5..533729e020fda84b4abcd043662ad19fff0a4883 100644 (file)
@@ -160,11 +160,13 @@ static int ghb_select_fallback( GValue *settings, int mux, int acodec )
        }
        if ( mux == HB_MUX_MKV )
        {
-               mask =  HB_ACODEC_LAME |
-                               HB_ACODEC_FFAAC |
+               mask =  
+                               HB_ACODEC_FAAC |
+                               HB_ACODEC_LAME |
+                               HB_ACODEC_VORBIS |
                                HB_ACODEC_AC3 |
-                               HB_ACODEC_DCA |
-                               HB_ACODEC_DCA_HD;
+                               HB_ACODEC_FFAAC |
+                               HB_ACODEC_FFFLAC;
        }
        if (!(fallback & mask ))
        {