[SCM] libav/experimental: h263: improve hwaccel #ifdefs

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:02:32 UTC 2014


The following commit has been merged in the experimental branch:
commit 33259118155764ce27a3433894659dda1d148b5f
Author: Rémi Denis-Courmont <remi at remlab.net>
Date:   Tue Mar 25 20:19:57 2014 +0000

    h263: improve hwaccel #ifdefs

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 6c2f322..f6c79af 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -634,10 +634,10 @@ intrax8_decoded:
 }
 
 const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = {
-#if CONFIG_VAAPI
+#if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL
     AV_PIX_FMT_VAAPI_VLD,
 #endif
-#if CONFIG_VDPAU
+#if CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL
     AV_PIX_FMT_VDPAU,
 #endif
     AV_PIX_FMT_YUV420P,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list