ports/137873: [patch] sysutils/k3b - fix build against new ffmpeg

[Heiner]

The following reply was made to PR ports/137873; it has been noted by GNATS.

From: Heiner <h.eichmann at gmx.de>
To: bug-followup at freebsd.org,
 Alberto Villa <villa.alberto at gmail.com>
Cc:  
Subject: Re: ports/137873: [patch] sysutils/k3b - fix build against new ffmpeg
Date: Mon, 17 Aug 2009 21:37:53 +0200

 --Boundary-00=_RGbiKV8iaLNGROo
 Content-Type: text/plain;
   charset="iso-8859-6"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Hi Alberto,
 
 thanks for the patch. I think the pathes to the patched file is missing in 
 diffs header (see attached file). Beside this: please commit!
 
 
 Best regards,
 
 
 Heiner
 
 --Boundary-00=_RGbiKV8iaLNGROo
 Content-Type: text/x-c++src;
   charset="iso 8859-15";
   name="patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp"
 
 --- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig	2009-08-15 21:28:47.344449975 +0200
 +++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2009-08-15 21:30:16.985967181 +0200
 @@ -31,6 +31,9 @@
  #define FFMPEG_BUILD_PRE_4629
  #endif
  
 +#ifndef CODEC_ID_MP3LAME
 +#define CODEC_ID_MP3LAME CODEC_ID_MP3
 +#endif
  
  K3bFFMpegWrapper* K3bFFMpegWrapper::s_instance = 0;
  
 @@ -290,7 +293,7 @@
  #ifdef FFMPEG_BUILD_PRE_4629
      int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec,
  #else
 -    int len = avcodec_decode_audio( d->formatContext->streams[0]->codec,
 +    int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec,
  #endif
  				    (short*)d->outputBuffer, &d->outputBufferSize,
  				    d->packetData, d->packetSize );
 
 --Boundary-00=_RGbiKV8iaLNGROo--