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 /games-emulation/vbam/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 'games-emulation/vbam/files')
-rw-r--r--games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch34
-rw-r--r--games-emulation/vbam/files/vbam-1.8.0.1228-header.patch10
2 files changed, 44 insertions, 0 deletions
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch b/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch
new file mode 100644
index 000000000000..f2f9085f4a7f
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch
@@ -0,0 +1,34 @@
+--- vbam-1.8.0.1228/src/common/ffmpeg.cpp
++++ vbam-1.8.0.1228/src/common/ffmpeg.cpp
+@@ -178,17 +178,31 @@ MediaRet MediaRecorder::setup_video_stre
+ // make sure RGB is supported (mostly not)
+ if(codec->pix_fmts) {
+ const enum PixelFormat *p;
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ int64_t mask = 0;
++#endif
+ for(p = codec->pix_fmts; *p != -1; p++) {
+ // may get complaints about 1LL; thus the cast
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ mask |= ((int64_t)1) << *p;
++#endif
+ if(*p == pixfmt)
+ break;
+ }
+ if(*p == -1) {
+ // if not supported, use a converter to the next best format
+ // this is swscale, the converter used by the output demo
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ enum PixelFormat dp = (PixelFormat)avcodec_find_best_pix_fmt(mask, pixfmt, 0, NULL);
++#else
++#if LIBAVCODEC_VERSION_MICRO >= 100
++// FFmpeg
++ enum AVPixelFormat dp = avcodec_find_best_pix_fmt_of_list(codec->pix_fmts, pixfmt, 0, NULL);
++#else
++// Libav
++ enum AVPixelFormat dp = avcodec_find_best_pix_fmt2(codec->pix_fmts, pixfmt, 0, NULL);
++#endif
++#endif
+ if(dp == -1)
+ dp = codec->pix_fmts[0];
+ if(!(convpic = avcodec_alloc_frame()) ||
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1228-header.patch b/games-emulation/vbam/files/vbam-1.8.0.1228-header.patch
new file mode 100644
index 000000000000..81c73892dee0
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1228-header.patch
@@ -0,0 +1,10 @@
+--- vbam-1.8.0.1228/src/Util.h
++++ vbam-1.8.0.1228/src/Util.h
+@@ -23,6 +23,7 @@
+ bool utilIsZipFile(const char *);
+ void utilStripDoubleExtension(const char *, char *);
+ IMAGE_TYPE utilFindType(const char *);
++IMAGE_TYPE utilFindType(const char *, char (&)[2048]);
+ uint8_t *utilLoad(const char *, bool (*)(const char*), uint8_t *, int &);
+
+ void utilPutDword(uint8_t *, uint32_t);