diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-18 11:35:33 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-18 13:55:26 +0200 |
| commit | 076ab9f7e3b1f4a02d31bba2b8e55407f5deff17 (patch) | |
| tree | 320fe66529526408c631214c04bbf4e044fdacbf /libavcodec | |
| parent | a740cae4a0803a78c183f754189294b948ac6865 (diff) | |
| download | ffmpeg-076ab9f7e3b1f4a02d31bba2b8e55407f5deff17.tar.gz | |
Fix all VDPAU decoders.
Fixes ticket #3726.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 97f22d2dc0..d8ebe6c349 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; |