diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-07 09:16:08 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-07 09:16:08 +0200 |
| commit | 44d5db78dfc2e2180898d8db13822e339665b7a3 (patch) | |
| tree | 5a8ad6d447af343e4d43eb96a918e9f566460351 /staging/kdemultimedia/ffmpeg0.11.patch | |
| parent | c46eba9943dd0e63496ab3ee93cfb7da246386c9 (diff) | |
| parent | 334c2a7916a80d08b1c216cfbf02135e64891632 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nbd/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
kde-unstable/libkcompactdisc/PKGBUILD
Diffstat (limited to 'staging/kdemultimedia/ffmpeg0.11.patch')
| -rw-r--r-- | staging/kdemultimedia/ffmpeg0.11.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/staging/kdemultimedia/ffmpeg0.11.patch b/staging/kdemultimedia/ffmpeg0.11.patch deleted file mode 100644 index 527ac3992..000000000 --- a/staging/kdemultimedia/ffmpeg0.11.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Christoph Feck <christoph@maxiom.de> -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; - } - |