diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-04-18 04:56:34 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-04-18 10:32:43 +0200 |
| commit | 26b6d70c72e4c8204a428c4e64197cdf1fc8b3cf (patch) | |
| tree | f71ee63c43a27bee2289c43ebf7c5b9aa6c920be | |
| parent | 32919db4fb8acd95203849582c9d73bfe8790219 (diff) | |
| download | ffmpeg-26b6d70c72e4c8204a428c4e64197cdf1fc8b3cf.tar.gz | |
Do not overwrite VDPAU structures in ff_MPV_frame_start().
Fixes crashes with VDR and MPlayer as reported by irc user crow.
(cherry picked from commit 941b2240f2ce59c41f4a9ffec88c512f64c75613)
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 3df13100e6..4dc41e83da 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1774,7 +1774,7 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) return -1; } - if (!avctx->hwaccel) { + if (!avctx->hwaccel && !(avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)) { for(i=0; i<avctx->height; i++) memset(s->last_picture_ptr->f.data[0] + s->last_picture_ptr->f.linesize[0]*i, 0x80, avctx->width); |