From 1d5cf02e8a8f673e444bbecffd99f9ba5ce703e9 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Fri, 26 Feb 2016 22:32:20 +0100 Subject: media-video/dvdstyler: Drop old Package-Manager: portage-2.2.27 --- .../dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch | 31 ---------------------- media-video/dvdstyler/files/ffmpeg29.patch | 31 ---------------------- 2 files changed, 62 deletions(-) delete mode 100644 media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch delete mode 100644 media-video/dvdstyler/files/ffmpeg29.patch (limited to 'media-video/dvdstyler/files') diff --git a/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch deleted file mode 100644 index 2ddd41408b59..000000000000 --- a/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp -=================================================================== ---- DVDStyler-2.9.4.orig/src/mediaenc_ffmpeg.cpp -+++ DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp -@@ -179,7 +179,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea - c->time_base.den = isNTSC(videoFormat) ? 30000 : 25; - c->time_base.num = isNTSC(videoFormat) ? 1001 : 1; - c->gop_size = m_gopSize > 0 ? m_gopSize : (isNTSC(videoFormat) ? 15 : 12); -- c->pix_fmt = PIX_FMT_YUV420P; -+ c->pix_fmt = AV_PIX_FMT_YUV420P; - c->rc_buffer_size = VIDEO_BUF_SIZE; - c->rc_max_rate = 9000000; - c->rc_min_rate = 0; -@@ -280,7 +280,7 @@ void wxFfmpegMediaEncoder::CloseAudioEnc - m_audioStm = NULL; - } - --AVFrame* allocPicture(PixelFormat pix_fmt, int width, int height) { -+AVFrame* allocPicture(AVPixelFormat pix_fmt, int width, int height) { - AVFrame* frame = av_frame_alloc(); - if (!frame) - return NULL; -@@ -329,7 +329,7 @@ bool wxFfmpegMediaEncoder::OpenVideoEnco - return false; - } - -- m_imgConvertCtx = sws_getContext(c->width, c->height, PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, -+ m_imgConvertCtx = sws_getContext(c->width, c->height, AV_PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, - NULL, NULL, NULL); - if (!m_imgConvertCtx) { - wxLogError(wxT("Cannot initialize the conversion context")); diff --git a/media-video/dvdstyler/files/ffmpeg29.patch b/media-video/dvdstyler/files/ffmpeg29.patch deleted file mode 100644 index 22ab9a6451da..000000000000 --- a/media-video/dvdstyler/files/ffmpeg29.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: DVDStyler-2.9.3/src/mediaenc_ffmpeg.cpp -=================================================================== ---- DVDStyler-2.9.3.orig/src/mediaenc_ffmpeg.cpp -+++ DVDStyler-2.9.3/src/mediaenc_ffmpeg.cpp -@@ -178,7 +178,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea - c->time_base.den = isNTSC(videoFormat) ? 30000 : 25; - c->time_base.num = isNTSC(videoFormat) ? 1001 : 1; - c->gop_size = isNTSC(videoFormat) ? 15 : 12; -- c->pix_fmt = PIX_FMT_YUV420P; -+ c->pix_fmt = AV_PIX_FMT_YUV420P; - c->rc_buffer_size = VIDEO_BUF_SIZE; - c->rc_max_rate = 9000000; - c->rc_min_rate = 0; -@@ -279,7 +279,7 @@ void wxFfmpegMediaEncoder::CloseAudioEnc - m_audioStm = NULL; - } - --AVFrame* allocPicture(PixelFormat pix_fmt, int width, int height) { -+AVFrame* allocPicture(AVPixelFormat pix_fmt, int width, int height) { - AVFrame* frame = av_frame_alloc(); - if (!frame) - return NULL; -@@ -318,7 +318,7 @@ bool wxFfmpegMediaEncoder::OpenVideoEnco - return false; - } - -- m_imgConvertCtx = sws_getContext(c->width, c->height, PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, -+ m_imgConvertCtx = sws_getContext(c->width, c->height, AV_PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, - NULL, NULL, NULL); - if (!m_imgConvertCtx) { - wxLogError(wxT("Cannot initialize the conversion context")); -- cgit v1.2.3-65-gdbad