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 05:08:24 +0200 |
| commit | 941b2240f2ce59c41f4a9ffec88c512f64c75613 (patch) | |
| tree | 57a55080112abf2a046e6a711a3d5b5e93cf6dcf | |
| parent | a614f892a6cf9976ce861d22a113fe4597ec1af1 (diff) | |
| download | ffmpeg-941b2240f2ce59c41f4a9ffec88c512f64c75613.tar.gz | |
Do not overwrite VDPAU structures in ff_MPV_frame_start().
Fixes crashes with VDR and MPlayer as reported by irc user crow.
| -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 45fedcb2ca..8b4e6ed5b4 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1789,7 +1789,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); |