X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fencvorbis.c;h=ce27ea0211334bb96a9d57124e03b99f8258c4fc;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=5ba0732910359a9b24fe79ab96a5c1db84256ac7;hpb=2707a4c05f84b3846e4e77ca4e9850cc61ffca10;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/encvorbis.c b/libhb/encvorbis.c
index 5ba07329..ce27ea02 100644
--- a/libhb/encvorbis.c
+++ b/libhb/encvorbis.c
@@ -123,12 +123,25 @@ int encvorbisInit( hb_work_object_t * w, hb_job_t * job )
             pv->channel_map[0] = 0;
             break;
         case 6:
-            pv->channel_map[0] = 0;
-            pv->channel_map[1] = 2;
-            pv->channel_map[2] = 1;
-            pv->channel_map[3] = 4;
-            pv->channel_map[4] = 5;
-            pv->channel_map[5] = 3;
+            // Vorbis use the following channels map = L C R Ls Rs Lfe
+            if( audio->config.in.codec == HB_ACODEC_AC3 )
+            {
+                pv->channel_map[0] = 1;
+                pv->channel_map[1] = 2;
+                pv->channel_map[2] = 3;
+                pv->channel_map[3] = 4;
+                pv->channel_map[4] = 5;
+                pv->channel_map[5] = 0;
+            }
+            else
+            {
+                pv->channel_map[0] = 1;
+                pv->channel_map[1] = 0;
+                pv->channel_map[2] = 2;
+                pv->channel_map[3] = 3;
+                pv->channel_map[4] = 4;
+                pv->channel_map[5] = 5;
+            }
             break;
         default:
             hb_log("encvorbis.c: Unable to correctly proccess %d channels, assuming stereo.", pv->out_discrete_channels);
@@ -252,6 +265,14 @@ int encvorbisWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
     hb_work_private_t * pv = w->private_data;
     hb_buffer_t * buf;
 
+    if ( (*buf_in)->size <= 0 )
+    {
+        /* EOF on input - send it downstream & say we're done */
+        *buf_out = *buf_in;
+        *buf_in = NULL;
+       return HB_WORK_DONE;
+    }
+
     hb_list_add( pv->list, *buf_in );
     *buf_in = NULL;