diff options
Diffstat (limited to 'media-video/mplayer/files/vaapi/03-mplayer-vaapi-0.29.patch')
| -rw-r--r-- | media-video/mplayer/files/vaapi/03-mplayer-vaapi-0.29.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/media-video/mplayer/files/vaapi/03-mplayer-vaapi-0.29.patch b/media-video/mplayer/files/vaapi/03-mplayer-vaapi-0.29.patch index d2f7bba..ec483af 100644 --- a/media-video/mplayer/files/vaapi/03-mplayer-vaapi-0.29.patch +++ b/media-video/mplayer/files/vaapi/03-mplayer-vaapi-0.29.patch @@ -1,15 +1,15 @@ -commit ea392cb5fb1265c433b530535108ad8a441b61f6 +commit 5fbfa3b77f6b3f55cc61df16533324ebcf8e0b70 Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> Date: Fri Feb 12 11:03:00 2010 +0000 Add compatibility with original VA-API 0.29. diff --git a/configure b/configure -index 39fef26..f2f9f2e 100755 +index 8011680..f7ce215 100755 --- a/configure +++ b/configure -@@ -5109,20 +5109,35 @@ echores "$_glu" - echocheck "VA API" +@@ -6167,20 +6167,35 @@ fi #if os2 + echocheck "VA-API" if test "$_vaapi" = yes -o "$_vaapi" = auto; then _vaapi=no + _vaapi_old=no @@ -30,7 +30,7 @@ index 39fef26..f2f9f2e 100755 if test "$_vaapi" = yes ; then def_vaapi='#define CONFIG_VAAPI 1' - libs_mencoder="$libs_mencoder -lva" -- libs_mplayer="$libs_mplayer -lva-x11" +- libs_mplayer="$libs_mplayer -lva-x11 -lva" + if test "$_vaapi_old" = no ; then + def_vaapi_old='#define CONFIG_VAAPI_OLD 0' + libs_mencoder="$libs_mencoder -lva" @@ -40,22 +40,22 @@ index 39fef26..f2f9f2e 100755 + _mencoder="no" + libs_mplayer="$libs_mplayer -lva" + fi - _vomodules="vaapi $_vomodules" + vomodules="vaapi $vomodules" else def_vaapi='#define CONFIG_VAAPI 0' + def_vaapi_old='#define CONFIG_VAAPI_OLD 0' - _novomodules="vaapi $_novomodules" + novomodules="vaapi $novomodules" _libavhwaccels=`echo $_libavhwaccels | sed -e "s/\(MPEG[124]\|H26[34]\|WMV3\|VC1\)_VAAPI_HWACCEL//g"` fi -@@ -8759,6 +8774,7 @@ CONFIG_POSTPROC = yes - # Prevent building libavcodec/imgresample.c with conflicting symbols - CONFIG_SWSCALE=yes - CONFIG_VAAPI=$_vaapi -+CONFIG_VAAPI_OLD=$_vaapi_old - CONFIG_VDPAU=$_vdpau - CONFIG_XVMC=$_xvmc - CONFIG_ZLIB=$_zlib -@@ -9143,6 +9159,7 @@ $def_tdfxvid +@@ -8862,6 +8877,7 @@ CONFIG_MLIB = $_mlib + CONFIG_MUXERS = $_mencoder + CONFIG_POSTPROC = yes + CONFIG_VAAPI = $_vaapi ++CONFIG_VAAPI_OLD= $_vaapi_old + CONFIG_VDPAU = $_vdpau + CONFIG_XVMC = $_xvmc + CONFIG_ZLIB = $_zlib +@@ -9241,6 +9257,7 @@ $def_tdfxvid $def_tga $def_v4l2 $def_vaapi @@ -162,7 +162,7 @@ index 0000000..f463118 + +#endif /* AVCODEC_VAAPI_COMPAT_H */ diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c -index a365428..efe92b8 100644 +index b61a9ca..cab6e41 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -123,8 +123,8 @@ static void fill_vaapi_pic(VAPictureH264 *va_pic, @@ -275,7 +275,7 @@ index 2c0fdf9..ff83b96 100644 #include "mpegvideo.h" diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c -index 21bc778..8961e9e 100644 +index 2e870dc..637546a 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -52,24 +52,24 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_ @@ -331,7 +331,7 @@ index 21bc778..8961e9e 100644 slice_param->quantiser_scale_code = quantiser_scale_code; slice_param->intra_slice_flag = intra_slice_flag; diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c -index 4e606f0..5a9a48e 100644 +index 466ce2f..ea306a4 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -54,42 +54,42 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ @@ -421,7 +421,7 @@ index 4e606f0..5a9a48e 100644 if (!iq_matrix) return -1; diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c -index 50a4ba2..6e319fc 100644 +index 992e1da..8264dd9 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -146,100 +146,100 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t @@ -658,7 +658,7 @@ index 50a4ba2..6e319fc 100644 default: ff_bp[0] = NULL; diff --git a/libvo/vo_vaapi.c b/libvo/vo_vaapi.c -index 3fe563a..d653b53 100644 +index 5f75b09..bbc95ff 100644 --- a/libvo/vo_vaapi.c +++ b/libvo/vo_vaapi.c @@ -45,7 +45,11 @@ |