[Utopic] Build failure in k3bffmpegwrapper.cpp

Merge request:

The following build failure is fixed in upstream debian, please see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739312#51

/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:58:23: error: 'AVCODEC_MAX_AUDIO_FRAME_SIZE' was not declared in this scope
     char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15];
                       ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp: In constructor 'K3bFFMpegFile::K3bFFMpegFile(const QString&)':
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:74:57: error: 'class K3bFFMpegFile::Private' has no member named 'outputBuffer'
     int offset = 0x10 - (reinterpret_cast<intptr_t>(&d->outputBuffer) & 0xf);
                                                         ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:75:34: error: 'class K3bFFMpegFile::Private' has no member named 'outputBuffer'
     d->alignedOutputBuffer = &d->outputBuffer[offset];
                                  ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp: In member function 'void K3bFFMpegFile::close()':
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:185:9: error: '::av_close_input_file' has not been declared
         ::av_close_input_file( d->formatContext );
         ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp: In member function 'QString K3bFFMpegFile::typeComment() const':
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:230:10: error: 'CODEC_ID_WMAV1' was not declared in this scope
     case CODEC_ID_WMAV1:
          ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:232:10: error: 'CODEC_ID_WMAV2' was not declared in this scope
     case CODEC_ID_WMAV2:
          ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:237:10: error: 'CODEC_ID_MP3' was not declared in this scope
     case CODEC_ID_MP3:
          ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:240:10: error: 'CODEC_ID_AAC' was not declared in this scope
     case CODEC_ID_AAC:
          ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp: In member function 'int K3bFFMpegFile::fillOutputBuffer()':
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:339:31: error: 'AVCODEC_MAX_AUDIO_FRAME_SIZE' was not declared in this scope
         d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
                               ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:345:19: error: '::avcodec_decode_audio3' has not been declared
         int len = ::avcodec_decode_audio3(
                   ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp: In member function 'K3bFFMpegFile* K3bFFMpegWrapper::open(const QString&) const':
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:436:29: error: 'CODEC_ID_WMAV1' was not declared in this scope
         if( file->type() == CODEC_ID_WMAV1 ||
                             ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:437:29: error: 'CODEC_ID_WMAV2' was not declared in this scope
             file->type() == CODEC_ID_WMAV2 ||
                             ^
/«PKGBUILDDIR»/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:438:29: error: 'CODEC_ID_AAC' was not declared in this scope
             file->type() == CODEC_ID_AAC )
                             ^
make[3]: *** [plugins/decoder/ffmpeg/CMakeFiles/k3bffmpegdecoder.dir/k3bffmpegwrapper.o] Error 1
plugins/decoder/ffmpeg/CMakeFiles/k3bffmpegdecoder.dir/build.make:103: recipe for target 'plugins/decoder/ffmpeg/CMakeFiles/k3bffmpegdecoder.dir/k3bffmpegwrapper.o' failed
make[3]: Leaving directory '/«PKGBUILDDIR»/obj-x86_64-linux-gnu'
make[2]: *** [plugins/decoder/ffmpeg/CMakeFiles/k3bffmpegdecoder.dir/all] Error 2
CMakeFiles/Makefile2:1118: recipe for target 'plugins/decoder/ffmpeg/CMakeFiles/k3bffmpegdecoder.dir/all' failed
make[2]: Leaving directory '/«PKGBUILDDIR»/obj-x86_64-linux-gnu'
make[1]: *** [all] Error 2
Makefile:126: recipe for target 'all' failed
make[1]: Leaving directory '/«PKGBUILDDIR»/obj-x86_64-linux-gnu'
dh_auto_build: make -j1 returned exit code 2
debian/rules:12: recipe for target 'build' failed
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status