From 91734dee3e97f809fb0fcf7add40f7af90fccd87 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 6 Jun 2012 00:01:34 +0000 Subject: Wed Jun 6 00:01:34 UTC 2012 --- staging/kdemultimedia/ffmpeg0.11.patch | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 staging/kdemultimedia/ffmpeg0.11.patch (limited to 'staging/kdemultimedia/ffmpeg0.11.patch') diff --git a/staging/kdemultimedia/ffmpeg0.11.patch b/staging/kdemultimedia/ffmpeg0.11.patch new file mode 100644 index 000000000..527ac3992 --- /dev/null +++ b/staging/kdemultimedia/ffmpeg0.11.patch @@ -0,0 +1,29 @@ +From: Christoph Feck +Date: Tue, 29 May 2012 13:53:18 +0000 +Subject: Two deprecated calls have been removed from ffmpeg 0.11. +X-Git-Tag: v4.8.80 +X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&a=commitdiff&h=4f03b20614c122e3e14473d42a000c0bffdce39c +--- +Two deprecated calls have been removed from ffmpeg 0.11. + +BUG:300732 +--- + + +--- a/ffmpegthumbnailer/moviedecoder.cpp ++++ b/ffmpegthumbnailer/moviedecoder.cpp +@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder() + void MovieDecoder::initialize(const QString& filename) + { + av_register_all(); +- avcodec_init(); + avcodec_register_all(); + + QFileInfo fileInfo(filename); + +- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) { ++ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) { + kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath(); + return; + } + -- cgit v1.2.3-54-g00ecf