diff options
author | Alexis Ballier <aballier@gentoo.org> | 2015-11-01 13:09:55 +0100 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2015-11-01 13:10:15 +0100 |
commit | f60e9bea867de26a864256ad091bd2610cf0f789 (patch) | |
tree | 78ffa4398667b7ad4fd26ea1a1890034aa921d68 /media-libs/wxsvg/files/ffmpeg29.patch | |
parent | media-sound/ardour: libsigc++-2.6.0 preparation. See bug 564414 (diff) | |
download | gentoo-f60e9bea867de26a864256ad091bd2610cf0f789.tar.gz gentoo-f60e9bea867de26a864256ad091bd2610cf0f789.tar.bz2 gentoo-f60e9bea867de26a864256ad091bd2610cf0f789.zip |
media-libs/wxsvg: Bump to 1.5.5. Fix build with ffmpeg git master. Add USE=libav and := deps on ffmpeg/libav.
Package-Manager: portage-2.2.23
Diffstat (limited to 'media-libs/wxsvg/files/ffmpeg29.patch')
-rw-r--r-- | media-libs/wxsvg/files/ffmpeg29.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/media-libs/wxsvg/files/ffmpeg29.patch b/media-libs/wxsvg/files/ffmpeg29.patch new file mode 100644 index 000000000000..5f191025fea5 --- /dev/null +++ b/media-libs/wxsvg/files/ffmpeg29.patch @@ -0,0 +1,13 @@ +Index: wxsvg-1.5.5/src/mediadec_ffmpeg.cpp +=================================================================== +--- wxsvg-1.5.5.orig/src/mediadec_ffmpeg.cpp ++++ wxsvg-1.5.5/src/mediadec_ffmpeg.cpp +@@ -263,7 +263,7 @@ wxImage wxFfmpegMediaDecoder::GetNextFra + avcodec_decode_video2(m_codecCtx, m_frame, &frameFinished, &packet); + if (frameFinished) { + SwsContext* imgConvertCtx = sws_getContext(m_codecCtx->width, m_codecCtx->height, m_codecCtx->pix_fmt, +- m_width, m_height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL); ++ m_width, m_height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL); + if (imgConvertCtx == NULL) { + av_free_packet(&packet); + return wxImage(); |