From: Jean-Paul Saman Date: Thu, 20 Jun 2013 09:17:22 +0000 (+0200) Subject: avcodec/video.c: correct error message when vlc_va_Get() fails. X-Git-Tag: 2.1.0-git~87 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8843e92cfa481ae6ef1d2534ca362a52d3179c63;p=vlc avcodec/video.c: correct error message when vlc_va_Get() fails. When calling vlc_va_Get() failed inside ffmpeg_GetFrameBuf(), then the error messages says "vaGrabSurface failed" however it should say "vlc_va_Get failed". Since hw accelerators are called through a vlc abstraction defined in va.h. It originated from libva (VAAPI), but it includes VDPAU and DXVA2 now. --- diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 4738e52482..2b55e89fa0 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -906,7 +906,7 @@ static int ffmpeg_va_GetFrameBuf( struct AVCodecContext *p_context, AVFrame *p_f if( vlc_va_Get( p_va, p_ff_pic ) ) { - msg_Err( p_dec, "VaGrabSurface failed" ); + msg_Err( p_dec, "vlc_va_Get failed" ); return -1; }