summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-12-17 13:24:00 -0500
committerMichael Sterrett <mr_bones_@gentoo.org>2015-12-17 19:38:47 -0500
commit5ddcb0427d1b99893aa6fb67645e6deb12bf0668 (patch)
treefd113db3c54075720225fa5bcbcb6917351571e8 /games-emulation/vbam/files
parentclean old (diff)
downloadgentoo-5ddcb0427d1b99893aa6fb67645e6deb12bf0668.tar.gz
gentoo-5ddcb0427d1b99893aa6fb67645e6deb12bf0668.tar.bz2
gentoo-5ddcb0427d1b99893aa6fb67645e6deb12bf0668.zip
clean old
Package-Manager: portage-2.2.24
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, 0 insertions, 44 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
deleted file mode 100644
index f2f9085f4a7f..000000000000
--- a/games-emulation/vbam/files/vbam-1.8.0.1228-ffmpeg2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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
deleted file mode 100644
index 81c73892dee0..000000000000
--- a/games-emulation/vbam/files/vbam-1.8.0.1228-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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);