Remove old muxers that are no longer used by HB

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3971 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 0 insertions, 1048 deletions

diff --git a/libhb/muxavi.c b/libhb/muxavi.c
deleted file mode 100644
index 85839e1ee..000000000
--- a/libhb/muxavi.c
+++ /dev/null
@@ -1,642 +0,0 @@
-/* $Id: muxavi.c,v 1.10 2005/03/30 18:17:29 titer Exp $
-
-   This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
-
-#include "hb.h"
-#include "hbffmpeg.h"
-
-#define AVIF_HASINDEX  0x10
-#define AVIIF_KEYFRAME 0x10
-#define FOURCC(a)      ((a[3]<<24)|(a[2]<<16)|(a[1]<<8)|a[0])
-
-/* Structures definitions */
-typedef struct __attribute__((__packed__))
-{
-    uint32_t FourCC;
-    uint32_t BytesCount;
-    uint32_t MicroSecPerFrame;
-    uint32_t MaxBytesPerSec;
-    uint32_t PaddingGranularity;
-    uint32_t Flags;
-    uint32_t TotalFrames;
-    uint32_t InitialFrames;
-    uint32_t Streams;
-    uint32_t SuggestedBufferSize;
-    uint32_t Width;
-    uint32_t Height;
-    uint32_t Reserved[4];
-
-} hb_avi_main_header_t;
-
-typedef struct __attribute__((__packed__))
-{
-    uint32_t FourCC;
-    uint32_t BytesCount;
-    uint32_t Type;
-    uint32_t Handler;
-    uint32_t Flags;
-    uint16_t Priority;
-    uint16_t Language;
-    uint32_t InitialFrames;
-    uint32_t Scale;
-    uint32_t Rate;
-    uint32_t Start;
-    uint32_t Length;
-    uint32_t SuggestedBufferSize;
-    uint32_t Quality;
-    uint32_t SampleSize;
-    int16_t  Left;
-    int16_t  Top;
-    int16_t  Right;
-    int16_t  Bottom;
-
-} hb_avi_stream_header_t;
-
-typedef struct __attribute__((__packed__))
-{
-    uint32_t FourCC;
-    uint32_t BytesCount;
-    uint32_t VideoFormatToken;
-    uint32_t VideoStandard;
-    uint32_t dwVerticalRefreshRate;
-    uint32_t dwHTotalInT;
-    uint32_t dwVTotalInLines;
-    uint16_t dwFrameAspectRatioDen;
-    uint16_t dwFrameAspectRatioNum;
-    uint32_t dwFrameWidthInPixels;
-    uint32_t dwFrameHeightInLines;
-    uint32_t nbFieldPerFrame;
-    uint32_t CompressedBMHeight;
-    uint32_t CompressedBMWidth;
-    uint32_t ValidBMHeight;
-    uint32_t ValidBMWidth;
-    uint32_t ValidBMXOffset;
-    uint32_t ValidBMYOffset;
-    uint32_t VideoXOffsetInT;
-    uint32_t VideoYValidStartLine;
-
-} hb_avi_vprp_info_t;
-
-typedef struct __attribute__((__packed__))
-{
-    uint32_t FourCC;
-    uint32_t BytesCount;
-    uint32_t Size;
-    uint32_t Width;
-    uint32_t Height;
-    uint16_t Planes;
-    uint16_t BitCount;
-    uint32_t Compression;
-    uint32_t SizeImage;
-    uint32_t XPelsPerMeter;
-    uint32_t YPelsPerMeter;
-    uint32_t ClrUsed;
-    uint32_t ClrImportant;
-
-} hb_bitmap_info_t;
-
-typedef struct __attribute__((__packed__))
-{
-    uint32_t FourCC;
-    uint32_t BytesCount;
-    uint16_t FormatTag;
-    uint16_t Channels;
-    uint32_t SamplesPerSec;
-    uint32_t AvgBytesPerSec;
-    uint16_t BlockAlign;
-    uint16_t BitsPerSample;
-    uint16_t Size;
-
-} hb_wave_formatex_t;
-
-typedef struct __attribute__((__packed__))
-{
-    uint16_t Id;
-    uint32_t Flags;
-    uint16_t BlockSize;
-    uint16_t FramesPerBlock;
-    uint16_t CodecDelay;
-
-} hb_wave_mp3_t;
-
-static void WriteBuffer( FILE * file, hb_buffer_t * buf )
-{
-    fwrite( buf->data, buf->size, 1, file );
-}
-
-/* Little-endian write routines */
-
-static void WriteInt8( FILE * file, uint8_t val )
-{
-    fputc( val, file );
-}
-
-static void WriteInt16( FILE * file, uint16_t val )
-{
-    fputc( val & 0xFF, file );
-    fputc( val >> 8, file );
-}
-
-static void WriteInt32( FILE * file, uint32_t val )
-{
-    fputc( val & 0xFF, file );
-    fputc( ( val >> 8 ) & 0xFF, file );
-    fputc( ( val >> 16 ) & 0xFF, file );
-    fputc( val >> 24, file );
-}
-
-static void WriteBitmapInfo( FILE * file, hb_bitmap_info_t * info )
-{
-    WriteInt32( file, info->FourCC );
-    WriteInt32( file, info->BytesCount );
-    WriteInt32( file, info->Size );
-    WriteInt32( file, info->Width );
-    WriteInt32( file, info->Height );
-    WriteInt16( file, info->Planes );
-    WriteInt16( file, info->BitCount );
-    WriteInt32( file, info->Compression );
-    WriteInt32( file, info->SizeImage );
-    WriteInt32( file, info->XPelsPerMeter );
-    WriteInt32( file, info->YPelsPerMeter );
-    WriteInt32( file, info->ClrUsed );
-    WriteInt32( file, info->ClrImportant );
-}
-
-static void WriteWaveFormatEx( FILE * file, hb_wave_formatex_t * format )
-{
-    WriteInt32( file, format->FourCC );
-    WriteInt32( file, format->BytesCount );
-    WriteInt16( file, format->FormatTag );
-    WriteInt16( file, format->Channels );
-    WriteInt32( file, format->SamplesPerSec );
-    WriteInt32( file, format->AvgBytesPerSec );
-    WriteInt16( file, format->BlockAlign );
-    WriteInt16( file, format->BitsPerSample );
-    WriteInt16( file, format->Size );
-}
-
-static void WriteWaveMp3( FILE * file, hb_wave_mp3_t * mp3 )
-{
-    WriteInt16( file, mp3->Id );
-    WriteInt32( file, mp3->Flags );
-    WriteInt16( file, mp3->BlockSize );
-    WriteInt16( file, mp3->FramesPerBlock );
-    WriteInt16( file, mp3->CodecDelay );
-}
-
-static void WriteMainHeader( FILE * file, hb_avi_main_header_t * header )
-{
-    WriteInt32( file, header->FourCC );
-    WriteInt32( file, header->BytesCount );
-    WriteInt32( file, header->MicroSecPerFrame );
-    WriteInt32( file, header->MaxBytesPerSec );
-    WriteInt32( file, header->PaddingGranularity );
-    WriteInt32( file, header->Flags );
-    WriteInt32( file, header->TotalFrames );
-    WriteInt32( file, header->InitialFrames );
-    WriteInt32( file, header->Streams );
-    WriteInt32( file, header->SuggestedBufferSize );
-    WriteInt32( file, header->Width );
-    WriteInt32( file, header->Height );
-    WriteInt32( file, header->Reserved[0] );
-    WriteInt32( file, header->Reserved[1] );
-    WriteInt32( file, header->Reserved[2] );
-    WriteInt32( file, header->Reserved[3] );
-}
-
-static void WriteStreamHeader( FILE * file, hb_avi_stream_header_t * header )
-{
-    WriteInt32( file, header->FourCC );
-    WriteInt32( file, header->BytesCount );
-    WriteInt32( file, header->Type );
-    WriteInt32( file, header->Handler );
-    WriteInt32( file, header->Flags );
-    WriteInt16( file, header->Priority );
-    WriteInt16( file, header->Language );
-    WriteInt32( file, header->InitialFrames );
-    WriteInt32( file, header->Scale );
-    WriteInt32( file, header->Rate );
-    WriteInt32( file, header->Start );
-    WriteInt32( file, header->Length );
-    WriteInt32( file, header->SuggestedBufferSize );
-    WriteInt32( file, header->Quality );
-    WriteInt32( file, header->SampleSize );
-    WriteInt16( file, header->Left );
-    WriteInt16( file, header->Top );
-    WriteInt16( file, header->Right );
-    WriteInt16( file, header->Bottom );
-}
-
-static void WriteVprpInfo( FILE * file, hb_avi_vprp_info_t * info )
-{
-    WriteInt32( file, info->FourCC );
-    WriteInt32( file, info->BytesCount );
-    WriteInt32( file, info->VideoFormatToken );
-    WriteInt32( file, info->VideoStandard );
-    WriteInt32( file, info->dwVerticalRefreshRate );
-    WriteInt32( file, info->dwHTotalInT );
-    WriteInt32( file, info->dwVTotalInLines );
-    WriteInt16( file, info->dwFrameAspectRatioDen );
-    WriteInt16( file, info->dwFrameAspectRatioNum );
-    WriteInt32( file, info->dwFrameWidthInPixels );
-    WriteInt32( file, info->dwFrameHeightInLines );
-    WriteInt32( file, info->nbFieldPerFrame );
-    WriteInt32( file, info->CompressedBMHeight );
-    WriteInt32( file, info->CompressedBMWidth );
-    WriteInt32( file, info->ValidBMHeight );
-    WriteInt32( file, info->ValidBMWidth );
-    WriteInt32( file, info->ValidBMXOffset );
-    WriteInt32( file, info->ValidBMYOffset );
-    WriteInt32( file, info->VideoXOffsetInT );
-    WriteInt32( file, info->VideoYValidStartLine );
-}
-
-static void IndexAddInt32( hb_buffer_t * b, uint32_t val )
-{
-    if( b->size + 16 > b->alloc )
-    {
-        hb_log( "muxavi: reallocing index (%d MB)",
-                1 + b->alloc / 1024 / 1024 );
-        hb_buffer_realloc( b, b->alloc + 1024 * 1024 );
-    }
-
-    b->data[b->size++] = val & 0xFF;
-    b->data[b->size++] = ( val >> 8 ) & 0xFF;
-    b->data[b->size++] = ( val >> 16 ) & 0xFF;
-    b->data[b->size++] = val >> 24;
-}
-
-struct hb_mux_object_s
-{
-    HB_MUX_COMMON;
-
-    hb_job_t * job;
-
-    /* Data size in bytes, not including headers */
-    unsigned               size;
-    FILE                 * file;
-    hb_buffer_t          * index;
-    hb_avi_main_header_t   main_header;
-};
-
-struct hb_mux_data_s
-{
-    uint32_t				fourcc;
-    hb_avi_stream_header_t	header;
-    hb_avi_vprp_info_t		vprp_header;
-    union
-    {
-        hb_bitmap_info_t   v;
-        struct
-        {
-            hb_wave_formatex_t f;
-            hb_wave_mp3_t      m;
-        } a;
-    } format;
-};
-
-static void AddIndex( hb_mux_object_t * m )
-{
-    fseek( m->file, 0, SEEK_END );
-
-    /* Write the index at the end of the file */
-    WriteInt32( m->file, FOURCC( "idx1" ) );
-    WriteInt32( m->file, m->index->size );
-    WriteBuffer( m->file, m->index );
-
-    /* Update file size */
-    m->size += 8 + m->index->size;
-    fseek( m->file, 4, SEEK_SET );
-    WriteInt32( m->file, 2040 + m->size );
-
-    /* Update HASINDEX flag */
-    m->main_header.Flags |= AVIF_HASINDEX;
-    fseek( m->file, 24, SEEK_SET );
-    WriteMainHeader( m->file, &m->main_header );
-}
-
-
-/**********************************************************************
- * AVIInit
- **********************************************************************
- * Allocates things, create file, initialize and write headers
- *********************************************************************/
-static int AVIInit( hb_mux_object_t * m )
-{
-    hb_job_t   * job   = m->job;
-    hb_title_t * title = job->title;
-
-    hb_audio_t    * audio;
-    hb_mux_data_t * mux_data;
-
-    int audio_count = hb_list_count( title->list_audio );
-    int is_passthru = 0;
-    int is_ac3      = 0;
-    int hdrl_bytes;
-    int i;
-
-    /* Allocate index */
-    m->index       = hb_buffer_init( 1024 * 1024 );
-    m->index->size = 0;
-
-    /* Open destination file */
-    hb_log( "muxavi: opening %s", job->file );
-    m->file = fopen( job->file, "wb" );
-
-#define m m->main_header
-    /* AVI main header */
-    m.FourCC           = FOURCC( "avih" );
-    m.BytesCount       = sizeof( hb_avi_main_header_t ) - 8;
-    m.MicroSecPerFrame = (uint64_t) 1000000 * job->vrate_base / job->vrate;
-    m.Streams          = 1 + audio_count;
-    m.Width            = job->width;
-    m.Height           = job->height;
-#undef m
-
-    /* Video track */
-    mux_data = calloc( sizeof( hb_mux_data_t ), 1 );
-    job->mux_data = mux_data;
-
-#define h mux_data->header
-    /* Video stream header */
-    h.FourCC     = FOURCC( "strh" );
-    h.BytesCount = sizeof( hb_avi_stream_header_t ) - 8;
-    h.Type       = FOURCC( "vids" );
-
-    if( job->vcodec == HB_VCODEC_FFMPEG )
-        h.Handler = FOURCC( "divx" );
-    else if( job->vcodec == HB_VCODEC_X264 )
-        h.Handler = FOURCC( "h264" );
-
-    h.Scale      = job->vrate_base;
-    h.Rate       = job->vrate;
-#undef h
-
-#define f mux_data->format.v
-    /* Video stream format */
-    f.FourCC      = FOURCC( "strf" );
-    f.BytesCount  = sizeof( hb_bitmap_info_t ) - 8;
-    f.Size        = f.BytesCount;
-    f.Width       = job->width;
-    f.Height      = job->height;
-    f.Planes      = 1;
-    f.BitCount    = 24;
-    if( job->vcodec == HB_VCODEC_FFMPEG )
-        f.Compression = FOURCC( "DX50" );
-    else if( job->vcodec == HB_VCODEC_X264 )
-        f.Compression = FOURCC( "H264" );
-#undef f
-
-#define g mux_data->vprp_header
-    /* Vprp video stream header */	
-    AVRational sample_aspect_ratio = ( AVRational ){ job->anamorphic.par_width, job->anamorphic.par_height };
-    AVRational dar = av_mul_q( sample_aspect_ratio, ( AVRational ){ job->width, job->height } );
-    int num, den;
-    av_reduce(&num, &den, dar.num, dar.den, 0xFFFF);
-
-    g.FourCC                = FOURCC( "vprp" );
-    g.BytesCount            = sizeof( hb_avi_vprp_info_t ) - 8;
-    g.VideoFormatToken      = 0;
-    g.VideoStandard         = 0;
-    g.dwVerticalRefreshRate = job->vrate / job->vrate_base;
-    g.dwHTotalInT           = job->width;
-    g.dwVTotalInLines       = job->height;
-    g.dwFrameAspectRatioDen = den;
-    g.dwFrameAspectRatioNum = num;
-    g.dwFrameWidthInPixels  = job->width;
-    g.dwFrameHeightInLines  = job->height;
-    g.nbFieldPerFrame       = 1;
-    g.CompressedBMHeight    = job->height;
-    g.CompressedBMWidth     = job->width;
-    g.ValidBMHeight         = job->height;
-    g.ValidBMWidth          = job->width;
-    g.ValidBMXOffset        = 0;
-    g.ValidBMYOffset        = 0;
-    g.VideoXOffsetInT       = 0;
-    g.VideoYValidStartLine  = 0;
-#undef g
-
-    /* Audio tracks */
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
-    {
-        audio = hb_list_item( title->list_audio, i );
-
-        is_ac3 = (audio->config.out.codec == HB_ACODEC_AC3);
-        is_passthru = (audio->config.out.codec == HB_ACODEC_AC3) ||
-                      (audio->config.out.codec == HB_ACODEC_DCA);
-
-        mux_data = calloc( sizeof( hb_mux_data_t ), 1 );
-        audio->priv.mux_data = mux_data;
-
-#define h mux_data->header
-#define f mux_data->format.a.f
-#define m mux_data->format.a.m
-        /* Audio stream header */
-        h.FourCC        = FOURCC( "strh" );
-        h.BytesCount    = sizeof( hb_avi_stream_header_t ) - 8;
-        h.Type          = FOURCC( "auds" );
-        h.InitialFrames = 1;
-        h.Scale         = 1;
-        h.Rate          = is_passthru ? ( audio->config.in.bitrate / 8 ) :
-                                   ( audio->config.out.bitrate * 1000 / 8 );
-        h.Quality       = 0xFFFFFFFF;
-        h.SampleSize    = 1;
-
-        /* Audio stream format */
-        f.FourCC         = FOURCC( "strf" );
-        if( is_passthru )
-        {
-            f.BytesCount     = sizeof( hb_wave_formatex_t ) - 8;
-            f.FormatTag      = is_ac3 ? 0x2000 : 0x2001;
-            f.Channels       = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->config.in.channel_layout);
-            f.SamplesPerSec  = audio->config.in.samplerate;
-        }
-        else
-        {
-            f.BytesCount     = sizeof( hb_wave_formatex_t ) +
-                               sizeof( hb_wave_mp3_t ) - 8;
-            f.FormatTag      = 0x55;
-            f.Channels       = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
-            f.SamplesPerSec  = audio->config.out.samplerate;
-        }
-        f.AvgBytesPerSec = h.Rate;
-        f.BlockAlign     = 1;
-        if( is_passthru )
-        {
-            f.Size       = 0;
-        }
-        else
-        {
-            f.Size           = sizeof( hb_wave_mp3_t );
-            m.Id             = 1;
-            m.Flags          = 2;
-            m.BlockSize      = 1152 * f.AvgBytesPerSec / audio->config.out.samplerate;
-            m.FramesPerBlock = 1;
-            m.CodecDelay     = 1393;
-        }
-#undef h
-#undef f
-#undef m
-    }
-
-    hdrl_bytes =
-        /* Main header */
-        4 + sizeof( hb_avi_main_header_t ) +
-        /* strh for video + audios */
-        ( 1 + audio_count ) * ( 12 + sizeof( hb_avi_stream_header_t ) ) +
-        /* video strf */
-		sizeof( hb_bitmap_info_t ) +
-        /* video vprp */
-        ( job->anamorphic.mode ? sizeof( hb_avi_vprp_info_t ) : 0 ) +
-        /* audios strf */
-        audio_count * ( sizeof( hb_wave_formatex_t ) +
-                        ( is_passthru ? 0 : sizeof( hb_wave_mp3_t ) ) );
-
-    /* Here we really start to write into the file */
-
-    /* Main headers */
-    WriteInt32( m->file, FOURCC( "RIFF" ) );
-    WriteInt32( m->file, 2040 );
-    WriteInt32( m->file, FOURCC( "AVI " ) );
-    WriteInt32( m->file, FOURCC( "LIST" ) );
-    WriteInt32( m->file, hdrl_bytes );
-    WriteInt32( m->file, FOURCC( "hdrl" ) );
-    WriteMainHeader( m->file, &m->main_header );
-
-    /* Video track */
-    mux_data          = job->mux_data;
-    mux_data->fourcc = FOURCC( "00dc" );
-
-    WriteInt32( m->file, FOURCC( "LIST" ) );
-    WriteInt32( m->file, 4 + sizeof( hb_avi_stream_header_t ) +
-                sizeof( hb_bitmap_info_t )  +
-                ( job->anamorphic.mode ? sizeof( hb_avi_vprp_info_t ) : 0 ) );
-    WriteInt32( m->file, FOURCC( "strl" ) );
-    WriteStreamHeader( m->file, &mux_data->header );
-    WriteBitmapInfo( m->file, &mux_data->format.v );
-    if( job->anamorphic.mode )
-    {
-        WriteVprpInfo( m->file, &mux_data->vprp_header );
-    }
-
-    /* Audio tracks */
-    for( i = 0; i < audio_count; i++ )
-    {
-        char fourcc[4] = "00wb";
-
-        audio    = hb_list_item( title->list_audio, i );
-        mux_data = audio->priv.mux_data;
-
-        fourcc[1] = '1' + i; /* This is fine as we don't allow more
-                                than 8 tracks */
-        mux_data->fourcc = FOURCC( fourcc );
-
-        WriteInt32( m->file, FOURCC( "LIST" ) );
-        WriteInt32( m->file, 4 + sizeof( hb_avi_stream_header_t ) +
-                             sizeof( hb_wave_formatex_t ) +
-                             ( is_passthru ? 0 : sizeof( hb_wave_mp3_t ) ) );
-        WriteInt32( m->file, FOURCC( "strl" ) );
-        WriteStreamHeader( m->file, &mux_data->header );
-        WriteWaveFormatEx( m->file, &mux_data->format.a.f );
-        if( !is_passthru )
-        {
-            WriteWaveMp3( m->file, &mux_data->format.a.m );
-        }
-    }
-
-    WriteInt32( m->file, FOURCC( "JUNK" ) );
-    WriteInt32( m->file, 2020 - hdrl_bytes );
-    for( i = 0; i < 2020 - hdrl_bytes; i++ )
-    {
-        WriteInt8( m->file, 0 );
-    }
-    WriteInt32( m->file, FOURCC( "LIST" ) );
-    WriteInt32( m->file, 4 );
-    WriteInt32( m->file, FOURCC( "movi" ) );
-
-    return 0;
-}
-
-static int AVIMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
-                   hb_buffer_t * buf )
-{
-    hb_job_t   * job   = m->job;
-    hb_title_t * title = job->title;
-
-    hb_audio_t * audio;
-    int i;
-
-    /* Update index */
-    IndexAddInt32( m->index, mux_data->fourcc );
-    IndexAddInt32( m->index, (buf->frametype & HB_FRAME_KEY) ? AVIIF_KEYFRAME : 0 );
-    IndexAddInt32( m->index, 4 + m->size );
-    IndexAddInt32( m->index, buf->size );
-
-    /* Write the chunk to the file */
-    fseek( m->file, 0, SEEK_END );
-    WriteInt32( m->file, mux_data->fourcc );
-    WriteInt32( m->file, buf->size );
-    WriteBuffer( m->file, buf );
-
-    /* Chunks must be 2-bytes aligned */
-    if( buf->size & 1 )
-    {
-        WriteInt8( m->file, 0 );
-    }
-
-    /* Update headers */
-    m->size += 8 + EVEN( buf->size );
-    mux_data->header.Length++;
-
-    /* RIFF size */
-    fseek( m->file, 4, SEEK_SET );
-    WriteInt32( m->file, 2052 + m->size );
-
-    /* Mmmmh that's not nice */
-    fseek( m->file, 140, SEEK_SET );
-    WriteInt32( m->file, job->mux_data->header.Length );
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
-    {
-        int is_passthru;
-        audio = hb_list_item( title->list_audio, i );
-        is_passthru = (audio->config.out.codec == HB_ACODEC_AC3) ||
-                      (audio->config.out.codec == HB_ACODEC_DCA);
-        fseek( m->file, 264 + i *
-               ( 102 + ( is_passthru ? 0 :
-                 sizeof( hb_wave_mp3_t ) ) ), SEEK_SET );
-        WriteInt32( m->file, audio->priv.mux_data->header.Length );
-    }
-
-    /* movi size */
-    fseek( m->file, 2052, SEEK_SET );
-    WriteInt32( m->file, 4 + m->size );
-    return 0;
-}
-
-static int AVIEnd( hb_mux_object_t * m )
-{
-    hb_job_t * job = m->job;
-
-    hb_log( "muxavi: writing index" );
-    AddIndex( m );
-
-    hb_log( "muxavi: closing %s", job->file );
-    fclose( m->file );
-
-    hb_buffer_close( &m->index );
-
-    return 0;
-}
-
-hb_mux_object_t * hb_mux_avi_init( hb_job_t * job )
-{
-    hb_mux_object_t * m = calloc( sizeof( hb_mux_object_t ), 1 );
-    m->init      = AVIInit;
-    m->mux       = AVIMux;
-    m->end       = AVIEnd;
-    m->job       = job;
-    return m;
-}
-
diff --git a/libhb/muxogm.c b/libhb/muxogm.c
deleted file mode 100644
index 885dcca95..000000000
--- a/libhb/muxogm.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/* $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.fr/>.
-   It may be used under the terms of the GNU General Public License. */
-
-#include "hb.h"
-
-#include <ogg/ogg.h>
-
-struct hb_mux_object_s
-{
-    HB_MUX_COMMON;
-
-    hb_job_t * job;
-
-    FILE * file;
-};
-
-struct hb_mux_data_s
-{
-    int              codec;
-    ogg_stream_state os;
-    int              i_packet_no;
-};
-
-typedef struct __attribute__((__packed__))
-{
-    uint8_t i_packet_type;
-
-    char stream_type[8];
-    char sub_type[4];
-
-    int32_t i_size;
-
-    int64_t i_time_unit;
-    int64_t i_samples_per_unit;
-    int32_t i_default_len;
-
-    int32_t i_buffer_size;
-    int16_t i_bits_per_sample;
-    int16_t i_padding_0;            // hum hum
-    union
-    {
-        struct
-        {
-            int32_t i_width;
-            int32_t i_height;
-
-        } video;
-        struct
-        {
-            int16_t i_channels;
-            int16_t i_block_align;
-            int32_t i_avgbytespersec;
-        } audio;
-    } header;
-
-} ogg_stream_header_t;
-
-#define SetWLE( p, v ) _SetWLE( (uint8_t*)p, v)
-static void _SetWLE( uint8_t *p, uint16_t i_dw )
-{
-    p[1] = ( i_dw >>  8 )&0xff;
-    p[0] = ( i_dw       )&0xff;
-}
-
-#define SetDWLE( p, v ) _SetDWLE( (uint8_t*)p, v)
-static void _SetDWLE( uint8_t *p, uint32_t i_dw )
-{
-    p[3] = ( i_dw >> 24 )&0xff;
-    p[2] = ( i_dw >> 16 )&0xff;
-    p[1] = ( i_dw >>  8 )&0xff;
-    p[0] = ( i_dw       )&0xff;
-}
-#define SetQWLE( p, v ) _SetQWLE( (uint8_t*)p, v)
-static void _SetQWLE( uint8_t *p, uint64_t i_qw )
-{
-    SetDWLE( p,   i_qw&0xffffffff );
-    SetDWLE( p+4, ( i_qw >> 32)&0xffffffff );
-}
-
-static int OGMFlush( hb_mux_object_t * m, hb_mux_data_t * mux_data )
-{
-    for( ;; )
-    {
-        ogg_page og;
-        if( ogg_stream_flush( &mux_data->os, &og ) == 0 )
-        {
-            break;
-        }
-        if( fwrite( og.header, og.header_len, 1, m->file ) <= 0 ||
-            fwrite( og.body, og.body_len, 1, m->file ) <= 0 )
-        {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-/**********************************************************************
- * OGMInit
- **********************************************************************
- * Allocates hb_mux_data_t structures, create file and write headers
- *********************************************************************/
-static int OGMInit( hb_mux_object_t * m )
-{
-    hb_job_t   * job   = m->job;
-    hb_title_t * title = job->title;
-
-    hb_audio_t    * audio;
-    hb_mux_data_t * mux_data;
-    int i;
-
-    ogg_packet          op;
-    ogg_stream_header_t h;
-
-    /* Open output file */
-    if( ( m->file = fopen( job->file, "wb" ) ) == NULL )
-    {
-        hb_log( "muxogm: failed to open `%s'", job->file );
-        return -1;
-    }
-    hb_log( "muxogm: `%s' opened", job->file );
-
-    /* Video track */
-    mux_data              = malloc( sizeof( hb_mux_data_t ) );
-    mux_data->codec       = job->vcodec;
-    mux_data->i_packet_no = 0;
-    job->mux_data         = mux_data;
-    ogg_stream_init( &mux_data->os, 0 );
-
-    /* Audio */
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
-    {
-        audio                 = hb_list_item( title->list_audio, i );
-        mux_data              = malloc( sizeof( hb_mux_data_t ) );
-        mux_data->codec       = audio->config.out.codec;
-        mux_data->i_packet_no = 0;
-        audio->priv.mux_data       = mux_data;
-        ogg_stream_init( &mux_data->os, i + 1 );
-    }
-
-
-    /* First pass: all b_o_s packets */
-    hb_log("muxogm: Writing b_o_s header packets");
-    /* Video */
-    mux_data = job->mux_data;
-    switch( job->vcodec )
-    {
-        case HB_VCODEC_THEORA:
-            memcpy(&op, job->config.theora.headers[0], sizeof(op));
-            op.packet = job->config.theora.headers[0] + sizeof(op);
-            ogg_stream_packetin( &mux_data->os, &op );
-            break;
-        case HB_VCODEC_X264:
-        case HB_VCODEC_FFMPEG:
-        {
-                memset( &h, 0, sizeof( ogg_stream_header_t ) );
-                h.i_packet_type = 0x01;
-                memcpy( h.stream_type, "video    ", 8 );
-                if( mux_data->codec == HB_VCODEC_X264 )
-                {
-                    memcpy( h.sub_type, "H264", 4 );
-                }
-                else
-                {
-                    memcpy( h.sub_type, "DX50", 4 );
-                }
-                SetDWLE( &h.i_size, sizeof( ogg_stream_header_t ) - 1);
-                SetQWLE( &h.i_time_unit, (int64_t) 10 * 1000 * 1000 *
-                         (int64_t) job->vrate_base / (int64_t) job->vrate );
-                SetQWLE( &h.i_samples_per_unit, 1 );
-                SetDWLE( &h.i_default_len, 0 );
-                SetDWLE( &h.i_buffer_size, 1024*1024 );
-                SetWLE ( &h.i_bits_per_sample, 0 );
-                SetDWLE( &h.header.video.i_width,  job->width );
-                SetDWLE( &h.header.video.i_height, job->height );
-                op.packet   = (unsigned char*)&h;
-                op.bytes    = sizeof( ogg_stream_header_t );
-                op.b_o_s    = 1;
-                op.e_o_s    = 0;
-                op.granulepos = 0;
-                op.packetno = mux_data->i_packet_no++;
-                ogg_stream_packetin( &mux_data->os, &op );
-                break;
-            }
-        default:
-            hb_error( "muxogm: unhandled video codec" );
-            *job->die = 1;
-    }
-    OGMFlush( m, mux_data );
-
-    /* Audio */
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
-    {
-        audio   = hb_list_item( title->list_audio, i );
-        mux_data = audio->priv.mux_data;
-        memset( &h, 0, sizeof( ogg_stream_header_t ) );
-        switch( audio->config.out.codec )
-        {
-            case HB_ACODEC_LAME:
-            {
-                h.i_packet_type = 0x01;
-                memcpy( h.stream_type, "audio    ", 8 );
-                memcpy( h.sub_type, "55  ", 4 );
-
-                SetDWLE( &h.i_size, sizeof( ogg_stream_header_t ) - 1);
-                SetQWLE( &h.i_time_unit, 0 );
-                SetQWLE( &h.i_samples_per_unit, audio->config.out.samplerate );
-                SetDWLE( &h.i_default_len, 1 );
-                SetDWLE( &h.i_buffer_size, 30 * 1024 );
-                SetWLE ( &h.i_bits_per_sample, 0 );
-
-                SetDWLE( &h.header.audio.i_channels, 2 );
-                SetDWLE( &h.header.audio.i_block_align, 0 );
-                SetDWLE( &h.header.audio.i_avgbytespersec,
-                         audio->config.out.bitrate / 8 );
-
-                op.packet   = (unsigned char*) &h;
-                op.bytes    = sizeof( ogg_stream_header_t );
-                op.b_o_s    = 1;
-                op.e_o_s    = 0;
-                op.granulepos = 0;
-                op.packetno = mux_data->i_packet_no++;
-                ogg_stream_packetin( &mux_data->os, &op );
-                break;
-            }
-            case HB_ACODEC_VORBIS:
-            {
-                memcpy( &op, audio->priv.config.vorbis.headers[0],
-                        sizeof( ogg_packet ) );
-                op.packet = audio->priv.config.vorbis.headers[0] +
-                                sizeof( ogg_packet );
-                ogg_stream_packetin( &mux_data->os, &op );
-                break;
-            }
-            default:
-                hb_log( "muxogm: unhandled codec" );
-                break;
-        }
-        OGMFlush( m, mux_data );
-    }
-
-    /* second pass: all non b_o_s packets */
-    hb_log("muxogm: Writing non b_o_s header packets");
-    /* Video */
-    mux_data = job->mux_data;
-    switch( job->vcodec )
-    {
-        case HB_VCODEC_THEORA:
-            for (i = 1; i < 3; i++)
-            {
-                memcpy(&op, job->config.theora.headers[i], sizeof(op));
-                op.packet = job->config.theora.headers[i] + sizeof(op);
-                ogg_stream_packetin( &mux_data->os, &op );
-                OGMFlush( m, mux_data );
-            }
-            break;
-        case HB_VCODEC_X264:
-        case HB_VCODEC_FFMPEG:
-            break;
-        default:
-            hb_error( "muxogm: unhandled video codec" );
-            *job->die = 1;
-    }
-
-    /* Audio */
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
-    {
-        audio = hb_list_item( title->list_audio, i );
-        if( audio->config.out.codec == HB_ACODEC_VORBIS )
-        {
-            int       j;
-            mux_data = audio->priv.mux_data;
-
-            for( j = 1; j < 3; j++ )
-            {
-                memcpy( &op, audio->priv.config.vorbis.headers[j],
-                        sizeof( ogg_packet ) );
-                op.packet = audio->priv.config.vorbis.headers[j] +
-                                sizeof( ogg_packet );
-                ogg_stream_packetin( &mux_data->os, &op );
-
-                OGMFlush( m, mux_data );
-            }
-        }
-    }
-    hb_log( "muxogm: headers written" );
-
-    return 0;
-}
-
-static int OGMMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
-                   hb_buffer_t * buf )
-{
-    ogg_packet   op;
-
-    switch( mux_data->codec )
-    {
-        case HB_VCODEC_THEORA:
-            memcpy( &op, buf->data, sizeof( ogg_packet ) );
-            op.packet = malloc( op.bytes );
-            memcpy( op.packet, buf->data + sizeof( ogg_packet ), op.bytes );
-            break;
-        case HB_VCODEC_FFMPEG:
-        case HB_VCODEC_X264:
-            op.bytes  = buf->size + 1;
-            op.packet = malloc( op.bytes );
-            op.packet[0] = (buf->frametype & HB_FRAME_KEY) ? 0x08 : 0x00;
-            memcpy( &op.packet[1], buf->data, buf->size );
-            op.b_o_s       = 0;
-            op.e_o_s       = 0;
-            op.granulepos  = mux_data->i_packet_no;
-            op.packetno    = mux_data->i_packet_no++;
-            break;
-        case HB_ACODEC_LAME:
-            op.bytes  = buf->size + 1;
-            op.packet = malloc( op.bytes );
-            op.packet[0] = 0x08;
-            memcpy( &op.packet[1], buf->data, buf->size );
-            op.b_o_s       = 0;
-            op.e_o_s       = 0;
-            op.granulepos  = mux_data->i_packet_no * 1152;
-            op.packetno    = mux_data->i_packet_no++;
-            break;
-        case HB_ACODEC_VORBIS:
-            memcpy( &op, buf->data, sizeof( ogg_packet ) );
-            op.packet = malloc( op.bytes );
-            memcpy( op.packet, buf->data + sizeof( ogg_packet ), op.bytes );
-            break;
-
-        default:
-            hb_log( "muxogm: unhandled codec" );
-            op.bytes = 0;
-            op.packet = NULL;
-            break;
-    }
-
-    if( op.packet )
-    {
-        ogg_stream_packetin( &mux_data->os, &op );
-
-        for( ;; )
-        {
-            ogg_page og;
-            if( ogg_stream_pageout( &mux_data->os, &og ) == 0 )
-            {
-                break;
-            }
-
-            if( fwrite( og.header, og.header_len, 1, m->file ) <= 0 ||
-                fwrite( og.body, og.body_len, 1, m->file ) <= 0 )
-            {
-                hb_log( "muxogm: write failed" );
-                break;
-            }
-        }
-        free( op.packet );
-    }
-    return 0;
-}
-
-static int OGMEnd( hb_mux_object_t * m )
-{
-    hb_job_t * job = m->job;
-
-    hb_title_t * title = job->title;
-    hb_audio_t    * audio;
-    hb_mux_data_t * mux_data;
-    int          i;
-
-    mux_data = job->mux_data;
-    if( OGMFlush( m, mux_data ) < 0 )
-    {
-        return -1;
-    }
-    ogg_stream_clear( &mux_data->os );
-
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
-    {
-        audio = hb_list_item( title->list_audio, i );
-        mux_data = audio->priv.mux_data;
-        if( OGMFlush( m, mux_data ) < 0 )
-        {
-            return -1;
-        }
-        ogg_stream_clear( &mux_data->os );
-    }
-
-    fclose( m->file );
-    hb_log( "muxogm: `%s' closed", job->file );
-
-    return 0;
-}
-
-hb_mux_object_t * hb_mux_ogm_init( hb_job_t * job )
-{
-    hb_mux_object_t * m = calloc( sizeof( hb_mux_object_t ), 1 );
-    m->init      = OGMInit;
-    m->mux       = OGMMux;
-    m->end       = OGMEnd;
-    m->job       = job;
-    return m;
-}
-