Changeset 969

Show
Ignore:
Timestamp:
10/24/08 16:01:16 (3 months ago)
Author:
astrange
Message:

Replace trunk with 1.1 branch, keeping ffmpeg compatibility patches.
This will probably break local changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk

    • Property svn:externals changed from
      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

       to
      ffmpeg svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml https://services.corecodec.com/svn/matroska/trunk/libebml
      libmatroska https://services.corecodec.com/svn/matroska/trunk/libmatroska
      a52codec http://svn.cod3r.com/a52codec/trunk


  • trunk/FFissionCodec/FFissionDecoder.cpp

    r923 r969  
    287287        avContext->block_align = mInputFormat.mBytesPerPacket; 
    288288        avContext->frame_size = mInputFormat.mFramesPerPacket; 
    289         avContext->bits_per_sample = mInputFormat.mBitsPerChannel; 
     289        avContext->bits_per_coded_sample = mInputFormat.mBitsPerChannel; 
    290290         
    291291        if (avContext->sample_rate == 0) { 

  • trunk/FFusionCodec.c

    r967 r969  
    743743        glob->avContext->width = (**p->imageDescription).width; 
    744744        glob->avContext->height = (**p->imageDescription).height; 
    745                 glob->avContext->bits_per_sample = (**p->imageDescription).depth; 
     745                glob->avContext->bits_per_coded_sample = (**p->imageDescription).depth; 
    746746                 
    747747        // We also pass the FourCC since it allows the H263 hybrid decoder 

  • trunk/ff_dataref.c

    r745 r969  
    151151} /* dataref_write() */ 
    152152 
    153 static offset_t dataref_seek(URLContext *h, offset_t pos, int whence) 
     153static int64_t dataref_seek(URLContext *h, int64_t pos, int whence) 
    154154{ 
    155155        dataref_private *p = (dataref_private*)h->priv_data; 

  • trunk/ff_private.c

    r923 r969  
    179179        (*imgHdl)->hRes = 72 << 16; 
    180180        (*imgHdl)->vRes = 72 << 16; 
    181         (*imgHdl)->depth = codec->bits_per_sample; 
     181        (*imgHdl)->depth = codec->bits_per_coded_sample; 
    182182        (*imgHdl)->clutID = -1; // no color lookup table... 
    183183         
    …… 
    237237                asbd.mBytesPerPacket = codec->block_align; /* this is tested for alaw/mulaw/msadpcm */ 
    238238        asbd.mFramesPerPacket = codec->frame_size; /* works for mp3, all other codecs this is 0 anyway */ 
    239         asbd.mBitsPerChannel = codec->bits_per_sample; 
     239        asbd.mBitsPerChannel = codec->bits_per_coded_sample; 
    240240         
    241241        // this probably isn't quite right; FLV doesn't set frame_size or block_align,  
    …… 
    430430        ptr = write_int32(ptr, EndianS32_NtoL(codec->bit_rate / 8)); 
    431431        ptr = write_int16(ptr, EndianS16_NtoL(codec->block_align)); 
    432         ptr = write_int16(ptr, EndianS16_NtoL(codec->bits_per_sample)); 
     432        ptr = write_int16(ptr, EndianS16_NtoL(codec->bits_per_coded_sample)); 
    433433        ptr = write_int16(ptr, EndianS16_NtoL(codec->extradata_size)); 
    434434        /* now the remaining stuff */ 
    …… 
    489489        ptr = write_int16(ptr, EndianS16_NtoL(1)); /* planes */ 
    490490         
    491         ptr = write_int16(ptr, EndianS16_NtoL(codec->bits_per_sample ? codec->bits_per_sample : 24)); /* depth */ 
     491        ptr = write_int16(ptr, EndianS16_NtoL(codec->bits_per_coded_sample ? codec->bits_per_coded_sample : 24)); /* depth */ 
    492492        /* compression type */ 
    493493        ptr = write_int32(ptr, EndianS32_NtoL(codec->codec_tag));