media-video/dvdstyler: Fix ffmpeg patch and make it unconditional.

Package-Manager: portage-2.2.23

1 files changed, 31 insertions, 0 deletions

diff --git a/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch
new file mode 100644
index 000000000000..2ddd41408b59
--- /dev/null
+++ b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch
@@ -0,0 +1,31 @@
+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"));