app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch

   1 Index: k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
   2 ===================================================================
   3 --- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
   4 +++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
   5 @@ -194,7 +194,7 @@ QString K3bFFMpegFile::typeComment() con
   6      return i18n("Windows Media v1");
   7    case CODEC_ID_WMAV2:
   8      return i18n("Windows Media v2");
   9 -  case CODEC_ID_MP3LAME:
  10 +  case CODEC_ID_MP3:
  11      return i18n("MPEG 1 Layer III");
  12    case CODEC_ID_AAC:
  13      return i18n("Advanced Audio Coding (AAC)");
  14 @@ -290,7 +290,8 @@ int K3bFFMpegFile::fillOutputBuffer()
  15  #ifdef FFMPEG_BUILD_PRE_4629
  16      int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec,
  17  #else
  18 -    int len = avcodec_decode_audio( d->formatContext->streams[0]->codec,
  19 +    d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
  20 +    int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec,
  21  #endif
  22                                     (short*)d->outputBuffer, &d->outputBufferSize,
  23                                     d->packetData, d->packetSize );