Show
Ignore:
Timestamp:
08/02/08 16:24:20 (4 months ago)
Author:
astrange
Message:

Merge trunk to the branch.
Disable ssse3 qpel stuff (https://roundup.mplayerhq.hu/roundup/ffmpeg/issue463)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/perian-1.1

    • Property svn:externals changed from
      ffmpeg -r 13239 svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml -r 1306 https://services.corecodec.com/svn/matroska/trunk/libebml
      libmatroska -r 1306 https://services.corecodec.com/svn/matroska/trunk/libmatroska
      a52codec -r 64 http://svn.cod3r.com/a52codec/trunk
       to
      ffmpeg -r 14508 svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml -r 1306 https://services.corecodec.com/svn/matroska/trunk/libebml
      libmatroska -r 1306 https://services.corecodec.com/svn/matroska/trunk/libmatroska
      a52codec -r 64 http://svn.cod3r.com/a52codec/trunk

  • branches/perian-1.1/FFissionCodec/FFissionCodec.r

    r636 r923  
    9898#define kComponentInfo                                  "An AudioCodec that decodes DCA Audio into linear PCM" 
    9999#include "XCAResources.r" 
     100 
     101#define kPrimaryResourceID                              146 
     102#define kComponentType                                  'adec' 
     103#define kComponentSubtype                               kAudioFormatNellymoser 
     104#define kComponentName                                  "Nellymoser ASAO" 
     105#define kComponentInfo                                  "An AudioCodec that decodes Nellymoser ASAO into linear PCM" 
     106#include "XCAResources.r" 

  • branches/perian-1.1/FFissionCodec/FFissionDecoder.cpp

    r690 r923  
    4848        { kAudioFormatTTA, CODEC_ID_TTA }, 
    4949        { kAudioFormatDTS, CODEC_ID_DTS }, 
     50        { kAudioFormatNellymoser, CODEC_ID_NELLYMOSER }, 
    5051        { 0, CODEC_ID_NONE } 
    5152};