* [gentoo-commits] gentoo-x86 commit in kde-base/ffmpegthumbs/files: ffmpegthumbs-4.8.1-ffmpeg.patch
@ 2012-03-09 9:55 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2012-03-09 9:55 UTC (permalink / raw
To: gentoo-commits
aballier 12/03/09 09:55:08
Added: ffmpegthumbs-4.8.1-ffmpeg.patch
Log:
fix build with ffmpeg trunk
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Revision Changes Path
1.1 kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch?rev=1.1&content-type=text/plain
Index: ffmpegthumbs-4.8.1-ffmpeg.patch
===================================================================
Index: ffmpegthumbs-4.8.1/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp
===================================================================
--- ffmpegthumbs-4.8.1.orig/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp
+++ ffmpegthumbs-4.8.1/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp
@@ -52,12 +52,14 @@ MovieDecoder::~MovieDecoder()
void MovieDecoder::initialize(const QString& filename)
{
av_register_all();
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,0,0)
avcodec_init();
+#endif
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().toUtf8().data(), NULL, NULL) != 0) {
kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath();
return;
}
@@ -89,7 +91,7 @@ void MovieDecoder::destroy()
}
if ((!m_FormatContextWasGiven) && m_pFormatContext) {
- av_close_input_file(m_pFormatContext);
+ avformat_close_input(&m_pFormatContext);
m_pFormatContext = NULL;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/ffmpegthumbs/files: ffmpegthumbs-4.8.1-ffmpeg.patch
@ 2012-03-16 0:05 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2012-03-16 0:05 UTC (permalink / raw
To: gentoo-commits
aballier 12/03/16 00:05:50
Modified: ffmpegthumbs-4.8.1-ffmpeg.patch
Log:
add some more ifdefery to the patch, by Fabian Kislat, bug #407607
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Revision Changes Path
1.2 kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch?r1=1.1&r2=1.2
Index: ffmpegthumbs-4.8.1-ffmpeg.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpegthumbs-4.8.1-ffmpeg.patch 9 Mar 2012 09:55:08 -0000 1.1
+++ ffmpegthumbs-4.8.1-ffmpeg.patch 16 Mar 2012 00:05:50 -0000 1.2
@@ -18,12 +18,15 @@
kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath();
return;
}
-@@ -89,7 +91,7 @@ void MovieDecoder::destroy()
+@@ -89,7 +91,11 @@ void MovieDecoder::destroy()
}
if ((!m_FormatContextWasGiven) && m_pFormatContext) {
-- av_close_input_file(m_pFormatContext);
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,0,0)
+ av_close_input_file(m_pFormatContext);
++#else
+ avformat_close_input(&m_pFormatContext);
++#endif
m_pFormatContext = NULL;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/ffmpegthumbs/files: ffmpegthumbs-4.8.1-ffmpeg.patch
@ 2013-01-08 11:47 Michael Palimaka (kensington)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka (kensington) @ 2013-01-08 11:47 UTC (permalink / raw
To: gentoo-commits
kensington 13/01/08 11:47:55
Removed: ffmpegthumbs-4.8.1-ffmpeg.patch
Log:
Remove unused patches.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-08 11:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-09 9:55 [gentoo-commits] gentoo-x86 commit in kde-base/ffmpegthumbs/files: ffmpegthumbs-4.8.1-ffmpeg.patch Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2012-03-16 0:05 Alexis Ballier (aballier)
2013-01-08 11:47 Michael Palimaka (kensington)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox