X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fmuxmkv.c;h=2e8814ca9283ad588ade2aaad6ecbf4711bfa855;hb=83588c143bb574905fc23be31d1ab3b99ba5e791;hp=6a8a55cbe47d723bffb4b6c199c622d3a8cc6fac;hpb=c0e795c30dffcb96c31a60737952d81c998d9a23;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c
index 6a8a55cb..2e8814ca 100644
--- a/libhb/muxmkv.c
+++ b/libhb/muxmkv.c
@@ -40,8 +40,8 @@ static int yuv2rgb(int yuv)
     int r, g, b;
 
     y =  (yuv >> 16) & 0xff;
-    Cr = (yuv >>  8) & 0xff;
-    Cb = (yuv)       & 0xff;
+    Cb = (yuv >>  8) & 0xff;
+    Cr = (yuv      ) & 0xff;
 
     r = 1.164 * (y - 16)                      + 2.018 * (Cb - 128);
     g = 1.164 * (y - 16) - 0.813 * (Cr - 128) - 0.391 * (Cb - 128);
@@ -124,7 +124,6 @@ static int MKVInit( hb_mux_object_t * m )
             if (job->areBframes)
                 track->minCache = 1;
             break;
-        case HB_VCODEC_XVID:
         case HB_VCODEC_FFMPEG:
             track->codecID = MK_VCODEC_MP4ASP;
             track->codecPrivate = job->config.mpeg4.bytes;
@@ -288,7 +287,7 @@ static int MKVInit( hb_mux_object_t * m )
         int             len;
 
         subtitle = hb_list_item( title->list_subtitle, i );
-        if (subtitle->dest != PASSTHRUSUB)
+        if (subtitle->config.dest != PASSTHRUSUB)
             continue;
 
         memset(track, 0, sizeof(mk_TrackConfig));
@@ -314,6 +313,10 @@ static int MKVInit( hb_mux_object_t * m )
             default:
                 continue;
         }
+        if ( subtitle->config.default_track )
+        {
+            track->flagDefault = 1;
+        }
 
         mux_data = calloc(1, sizeof( hb_mux_data_t ) );
         subtitle->mux_data = mux_data;