X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fmuxogm.c;h=885dcca95a2bfe65909238250ddcef4bbfa28315;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=a7b72d510ece477af36768c4991313472b7b9774;hpb=bcd20ea430ced01a2c10605c8f6a77de9c6af410;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/muxogm.c b/libhb/muxogm.c
index a7b72d51..885dcca9 100644
--- a/libhb/muxogm.c
+++ b/libhb/muxogm.c
@@ -1,7 +1,7 @@
 /* $Id: muxogm.c,v 1.4 2005/02/20 00:41:56 titer Exp $
 
    This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.m0k.org/>.
+   Homepage: <http://handbrake.fr/>.
    It may be used under the terms of the GNU General Public License. */
 
 #include "hb.h"
@@ -153,7 +153,6 @@ static int OGMInit( hb_mux_object_t * m )
             op.packet = job->config.theora.headers[0] + sizeof(op);
             ogg_stream_packetin( &mux_data->os, &op );
             break;
-        case HB_VCODEC_XVID:
         case HB_VCODEC_X264:
         case HB_VCODEC_FFMPEG:
         {
@@ -164,10 +163,6 @@ static int OGMInit( hb_mux_object_t * m )
                 {
                     memcpy( h.sub_type, "H264", 4 );
                 }
-                else if( mux_data->codec == HB_VCODEC_XVID )
-                {
-                    memcpy( h.sub_type, "XVID", 4 );
-                }
                 else
                 {
                     memcpy( h.sub_type, "DX50", 4 );
@@ -262,7 +257,6 @@ static int OGMInit( hb_mux_object_t * m )
                 OGMFlush( m, mux_data );
             }
             break;
-        case HB_VCODEC_XVID:
         case HB_VCODEC_X264:
         case HB_VCODEC_FFMPEG:
             break;
@@ -310,7 +304,6 @@ static int OGMMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
             memcpy( op.packet, buf->data + sizeof( ogg_packet ), op.bytes );
             break;
         case HB_VCODEC_FFMPEG:
-        case HB_VCODEC_XVID:
         case HB_VCODEC_X264:
             op.bytes  = buf->size + 1;
             op.packet = malloc( op.bytes );