summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/ffdiaporama/files')
-rw-r--r--media-video/ffdiaporama/files/ffdiaporama-1.6-ffmpeg-2.0.patch32
-rw-r--r--media-video/ffdiaporama/files/ffdiaporama-2.0-libav9-deinterlacing.patch26
2 files changed, 0 insertions, 58 deletions
diff --git a/media-video/ffdiaporama/files/ffdiaporama-1.6-ffmpeg-2.0.patch b/media-video/ffdiaporama/files/ffdiaporama-1.6-ffmpeg-2.0.patch
deleted file mode 100644
index 6142cd5a37f..00000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-1.6-ffmpeg-2.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=476530
-
---- src/engine/cDeviceModelDef.h 2013-06-19 18:22:52.000000000 +0200
-+++ src/engine/cDeviceModelDef.h 2013-07-21 14:11:48.014827071 +0200
-@@ -64,6 +64,11 @@
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
-
-+ #if (LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,18,0))
-+ typedef AVCodecID CodecID;
-+ #define AVCODEC_MAX_AUDIO_FRAME_SIZE 192
-+ #endif
-+
- #if ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(51,73,0))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(54,31,0))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(54,19,0)))
- #define LIBAV_09
- #if defined(USELIBAVRESAMPLE)
-
---- src/engine/cBaseMediaFile.cpp 2013-06-19 18:22:52.000000000 +0200
-+++ src/engine/cBaseMediaFile.cpp 2013-07-21 14:15:18.754228717 +0200
-@@ -2167,7 +2167,11 @@
- }
-
- #else
-- int Ret=av_buffersrc_add_frame(VideoFilterIn,FrameBufferYUV,0);
-+ #if (LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,79,0))
-+ int Ret=av_buffersrc_add_frame(VideoFilterIn,FrameBufferYUV,0);
-+ #else
-+ int Ret=av_buffersrc_add_frame(VideoFilterIn,FrameBufferYUV);
-+ #endif
- if (Ret<0) {
- ToLog(LOGMSG_CRITICAL,QString("Error in cVideoFile::VideoFilter_Process : av_buffersrc_add_frame"));
- return VC_ERROR;
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.0-libav9-deinterlacing.patch b/media-video/ffdiaporama/files/ffdiaporama-2.0-libav9-deinterlacing.patch
deleted file mode 100644
index fe07b26b6b0..00000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.0-libav9-deinterlacing.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/engine/cBaseMediaFile.cpp 2013-11-23 10:44:04.586110402 +0100
-+++ src/engine/cBaseMediaFile.cpp 2013-11-23 12:14:24.914285498 +0100
-@@ -2150,11 +2150,23 @@
-
- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9)
- // LIBAV9
-+ AVFilterBufferRef *m_pBufferRef=NULL;
- int Ret=av_buffersrc_write_frame(VideoFilterIn,FrameBufferYUV);
- if (Ret<0) {
- ToLog(LOGMSG_CRITICAL,QString("Error in cVideoFile::VideoFilter_Process : av_buffersrc_write_frame"));
- return VC_ERROR;
- }
-+ while ((Ret=av_buffersink_read(VideoFilterOut,&m_pBufferRef)) >= 0) {
-+ if (!m_pBufferRef) return VC_ERROR; // for first frame ther is no return
-+ FrameBufferYUV->interlaced_frame=m_pBufferRef->video->interlaced;
-+ FrameBufferYUV->top_field_first =m_pBufferRef->video->top_field_first;
-+ if (m_pBufferRef) {
-+ if (FrameBufferYUV->opaque) avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
-+ FrameBufferYUV->opaque=(void *)avfilter_ref_buffer(m_pBufferRef,AV_PERM_READ);
-+ avfilter_unref_buffer(m_pBufferRef);
-+ m_pBufferRef = NULL;
-+ }
-+ }
- #else
- // FFMPEG 1.2
- int Ret=av_buffersrc_add_frame(VideoFilterIn,FrameBufferYUV,0);