Changeset 182

Show
Ignore:
Timestamp:
11/02/06 21:57:04 (2 years ago)
Author:
astrange
Message:

Don't set 'pasp' atom for mkv if it's square pixels.
Tell ffmpeg to use Pentium-M asm; speeds up CABAC for H.264.
Clean up configure flags.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/MkvMovieSetup.cpp

    r158 r182  
    436436    (*imgDesc)->depth = 24; 
    437437    (*imgDesc)->clutID = -1; 
    438         (*pasp)->hSpacing = EndianU32_NtoB((*pasp)->hSpacing); 
    439         (*pasp)->vSpacing = EndianU32_NtoB((*pasp)->vSpacing); 
    440         AddImageDescriptionExtension(imgDesc,(Handle)pasp,kICMImageDescriptionPropertyID_PixelAspectRatio); 
     438        if ((*pasp)->hSpacing != (*pasp)->vSpacing) { 
     439                (*pasp)->hSpacing = EndianU32_NtoB((*pasp)->hSpacing); 
     440                (*pasp)->vSpacing = EndianU32_NtoB((*pasp)->vSpacing); 
     441                AddImageDescriptionExtension(imgDesc,(Handle)pasp,kICMImageDescriptionPropertyID_PixelAspectRatio); 
     442        } 
    441443         
    442444        // this sets up anything else needed in the description for the specific codec. 

  • trunk/createStaticLibs.sh

    r181 r182  
    33buildid_ffmpeg="r`svn info ffmpeg | grep -F Revision | awk '{print $2}'`" 
    44 
    5 generalConfigureOptions="--disable-encoders --disable-muxers --disable-strip" 
     5generalConfigureOptions="--disable-encoders --disable-muxers --disable-strip --enable-gpl --enable-pp --enable-pthreads" 
    66 
    77if [ "$BUILD_STYLE" = "Development" ] ; then 
    8         extraConfigureOptions="--disable-opts --disable-mmx" #gcc can't build the MMX at -O0 due to compiler bugs 
     8        extraConfigureOptions="--disable-opts" 
    99fi 
    1010 
    …… 
    3535        cd "$BUILDDIR" 
    3636        if [ `arch` != i386 ] ; then 
    37                 "$SRCROOT/ffmpeg/configure" --cross-compile --arch=x86 --enable-pp --enable-gpl --extra-ldflags='-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk' --extra-cflags='-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk' $extraConfigureOptions $generalConfigureOptions 
     37                "$SRCROOT/ffmpeg/configure" --cross-compile --arch=x86 --extra-ldflags='-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk' --extra-cflags='-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk' $extraConfigureOptions $generalConfigureOptions --cpu=pentium-m  
    3838        else 
    39                 "$SRCROOT/ffmpeg/configure" --enable-pp --enable-gpl --enable-memalign-hack $extraConfigureOptions $generalConfigureOptions 
     39                "$SRCROOT/ffmpeg/configure" $extraConfigureOptions $generalConfigureOptions --cpu=pentium-m 
    4040        fi 
    4141        make -C libavutil   depend 
    …… 
    6161        cd "$BUILDDIR" 
    6262        if [ `arch` = ppc ] ; then 
    63                 "$SRCROOT/ffmpeg/configure" --enable-pp --enable-gpl $extraConfigureOptions $generalConfigureOptions 
     63                "$SRCROOT/ffmpeg/configure" $extraConfigureOptions $generalConfigureOptions 
    6464        else 
    65                 "$SRCROOT/ffmpeg/configure" --enable-pp --enable-gpl --arch=ppc  --extra-ldflags='-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk' --extra-cflags='-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk' $extraConfigureOptions $generalConfigureOptions 
     65                "$SRCROOT/ffmpeg/configure" --arch=ppc  --extra-ldflags='-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk' --extra-cflags='-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk' $extraConfigureOptions $generalConfigureOptions 
    6666        fi 
    6767        make -C libavutil   depend