summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-video/2mandvd/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-video/2mandvd/files')
-rw-r--r--media-video/2mandvd/files/2mandvd-1.7.3-libav.patch10
-rw-r--r--media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch27
2 files changed, 37 insertions, 0 deletions
diff --git a/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch b/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch
new file mode 100644
index 000000000000..59dfd1e33a1e
--- /dev/null
+++ b/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch
@@ -0,0 +1,10 @@
+--- videowrapper.h
++++ videowrapper.h
+@@ -11,6 +11,7 @@
+ #include <libavutil/common.h>
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
++ #include <libavutil/mathematics.h>
+ #include <libswscale/swscale.h>
+ }
+
diff --git a/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch b/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch
new file mode 100644
index 000000000000..89ecc4d23c60
--- /dev/null
+++ b/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch
@@ -0,0 +1,27 @@
+diff --git a/videowrapper.cpp b/videowrapper.cpp
+index 7ae4ad3..d50599b 100644
+--- a/videowrapper.cpp
++++ b/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
+@@ -91,13 +91,8 @@ int videowrapper::load_video(QString filename)
+
+ // *** OUVERTURE DU CODEC ***
+
+- #ifdef av_find_stream_info
+- if(avcodec_open(pCodecCtx, pCodec)<0)
+- {
+- #else
+ if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0)
+ {
+- #endif
+ qDebug() << "CAN'T FIND VIDEO CODEC";
+ return 1;
+ }