Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-cdr/k3b/files: k3b-2.0.2-libavformat54.patch
Date: Tue, 28 Feb 2012 23:31:09
Message-Id: 20120228233058.4F48C2004C@flycatcher.gentoo.org
1 aballier 12/02/28 23:30:58
2
3 Added: k3b-2.0.2-libavformat54.patch
4 Log:
5 fix build with libavformat 54 (ffmpeg/libav git atm)
6
7 (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch?rev=1.1&content-type=text/plain
14
15 Index: k3b-2.0.2-libavformat54.patch
16 ===================================================================
17 Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
18 ===================================================================
19 --- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
20 +++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
21 @@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
22 close();
23
24 // open the file
25 - int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
26 + int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
27 if( err < 0 ) {
28 kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
29 return false;
30 @@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
31 }
32
33 // dump some debugging info
34 - ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
35 + ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
36
37 return true;
38 }