[FFmpeg-cvslog] Fix all VDPAU decoders.
Carl Eugen Hoyos
git at videolan.org
Wed Jun 18 14:09:09 CEST 2014
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Jun 18 11:35:33 2014 +0200| [076ab9f7e3b1f4a02d31bba2b8e55407f5deff17] | committer: Carl Eugen Hoyos
Fix all VDPAU decoders.
Fixes ticket #3726.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=076ab9f7e3b1f4a02d31bba2b8e55407f5deff17
---
libavcodec/mpegvideo.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 97f22d2..d8ebe6c 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -434,6 +434,9 @@ static int frame_size_alloc(MpegEncContext *s, int linesize)
{
int alloc_size = FFALIGN(FFABS(linesize) + 64, 32);
+ if (s->avctx->hwaccel || s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ return 0;
+
if (linesize < 24) {
av_log(s->avctx, AV_LOG_ERROR, "Image too small, temporary buffers cannot function\n");
return AVERROR_PATCHWELCOME;
More information about the ffmpeg-cvslog
mailing list