* [gentoo-commits] gentoo-x86 commit in media-video/2mandvd/files: 2mandvd-1.8.4-libavformat54.patch
@ 2013-02-08 13:08 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2013-02-08 13:08 UTC (permalink / raw
To: gentoo-commits
aballier 13/02/08 13:08:43
Added: 2mandvd-1.8.4-libavformat54.patch
Log:
fix broken #if directive causing build failure with latest ffmpeg, bug #456170
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.1 media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch?rev=1.1&content-type=text/plain
Index: 2mandvd-1.8.4-libavformat54.patch
===================================================================
Index: 2ManDVD/videowrapper.cpp
===================================================================
--- 2ManDVD.orig/videowrapper.cpp
+++ 2ManDVD/videowrapper.cpp
@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper()
int videowrapper::load_video(QString filename)
{
// *** OUVERTURE DU FICHIER VIDEO ***
- #ifdef avformat_open_input
+ #if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,5,0)
if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0)
{
#else
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/2mandvd/files: 2mandvd-1.8.4-libavformat54.patch
@ 2013-06-17 18:00 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-06-17 18:00 UTC (permalink / raw
To: gentoo-commits
scarabeus 13/06/17 18:00:47
Modified: 2mandvd-1.8.4-libavformat54.patch
Log:
Fix usage of more deprecated symbols to be happy with libav9. Just append the diff to current libavformat53 patch.
(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Revision Changes Path
1.2 media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch?r1=1.1&r2=1.2
Index: 2mandvd-1.8.4-libavformat54.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 2mandvd-1.8.4-libavformat54.patch 8 Feb 2013 13:08:43 -0000 1.1
+++ 2mandvd-1.8.4-libavformat54.patch 17 Jun 2013 18:00:47 -0000 1.2
@@ -1,8 +1,7 @@
-Index: 2ManDVD/videowrapper.cpp
-===================================================================
---- 2ManDVD.orig/videowrapper.cpp
-+++ 2ManDVD/videowrapper.cpp
-@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper()
+diff -urN 2ManDVD.old/videowrapper.cpp 2ManDVD/videowrapper.cpp
+--- 2ManDVD.old/videowrapper.cpp 2013-06-17 19:46:47.455636396 +0200
++++ 2ManDVD/videowrapper.cpp 2013-06-17 19:55:04.156618725 +0200
+@@ -38,7 +38,7 @@
int videowrapper::load_video(QString filename)
{
// *** OUVERTURE DU FICHIER VIDEO ***
@@ -11,3 +10,29 @@
if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0)
{
#else
+@@ -50,7 +50,7 @@
+ }
+
+ // *** RECUPERATION DES INFORMATIONS DU MEDIA ***
+- if(av_find_stream_info(pFormatCtx)<0)
++ if(avformat_find_stream_info(pFormatCtx, NULL)<0)
+ {
+ qDebug() << "CAN'T READ INFORMATION FROM VIDEO FILE : " << filename;
+ return 1;
+@@ -90,15 +90,10 @@
+
+ // *** OUVERTURE DU CODEC ***
+
+- if(avcodec_open(pCodecCtx, pCodec)<0)
+- {
++ if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0) {
+ qDebug() << "CAN'T FIND VIDEO CODEC";
+ return 1;
+ }
+- /*if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0) {
+- qDebug() << "CAN'T FIND VIDEO CODEC";
+- return 1;
+- }*/
+
+ img_convert_ctx = sws_getContext(pCodecCtx->width,
+ pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/2mandvd/files: 2mandvd-1.8.4-libavformat54.patch
@ 2015-05-15 16:57 Michael Palimaka (kensington)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka (kensington) @ 2015-05-15 16:57 UTC (permalink / raw
To: gentoo-commits
kensington 15/05/15 16:57:37
Removed: 2mandvd-1.8.4-libavformat54.patch
Log:
Remove old.
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-15 16:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-15 16:57 [gentoo-commits] gentoo-x86 commit in media-video/2mandvd/files: 2mandvd-1.8.4-libavformat54.patch Michael Palimaka (kensington)
-- strict thread matches above, loose matches on Subject: below --
2013-06-17 18:00 Tomas Chvatal (scarabeus)
2013-02-08 13:08 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox