Add support for libav-9

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x1191738E

4 files changed, 502 insertions, 18 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 1f9d1ea02041..ea3fbcee44dd 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.868 2013/01/16 16:44:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.869 2013/01/17 09:01:57 lu_zero Exp $
+
+  17 Jan 2013; Luca Barbato <lu_zero@gentoo.org> mplayer-1.1-r1.ebuild,
+  +files/mplayer-1.1-libav-9.patch:
+  Add support for libav-9 as well.
 
   16 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/mplayer-1.1-libav-0.8.patch, mplayer-1.1-r1.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 20644811cfcd..ca83c2da0896 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -10,6 +10,7 @@ AUX mplayer-1.0_rc4_p20110322-sami_subtitle_parsing.patch 417 SHA256 413876d3250
 AUX mplayer-1.1-codecid.patch 656 SHA256 3844fcbdb3113e805a4c1e9231e8ff9d93c1e8b5400778d29c1c3b485d0d0ddd SHA512 14c78953b9523badaeadb60a72e101fb4100802a312c2f30c1e4fdc2a6ff32cdd82193bbff8e9ee4b1448d6bb0f1d5662f12237a09d86f2993007793d5fc46b3 WHIRLPOOL 631a495288be4b48ef24a7960ba344628d522043831dcc5519d276880209b1422ad90cb9183a363d9c75ec14481a7ba5ea254bd446d639f5a41c194ef6cf73f1
 AUX mplayer-1.1-ffmpeg.patch 1452 SHA256 9c04f0a14f625a41a7bda49c5fc8d2622a85da349799904ec56244e87dd38d26 SHA512 23aaf6fc85101b92e81e37f39c2929874891387d15e420d524dc7248bcf995273d763b98ecf496e06d89a99b567631c5978adfda1f3ad076fbf980347ccf7e49 WHIRLPOOL 0549d6765bc7f22f325bab4a6a70dfe9827a48fd486aa8acc912e717948f814be695441ca70d38a7d074d38cfd5ce04c14a1bcc37b77475cc059a925b19d0305
 AUX mplayer-1.1-libav-0.8.patch 441 SHA256 15d00ab246c9c61e598efddbd506d7ad289e7302d5792c8e36471308acd90e58 SHA512 577e5fb8ae9aeeb05fb74b95a8d16392ba5fc9b44da77122b2cee830559281b2c52a31aff6c5a8802c6552545daa7df7a85d33d7b36f83dd8f1b61ee4e08bcd4 WHIRLPOOL c95a776dea42c6b6b7480cc8c49d164687e9c59a566c921cdf562315fc5eced8b299ab98d23b970ff62e60471aa3a18f9492d81552ef12d0a67f4614b80f061e
+AUX mplayer-1.1-libav-9.patch 19580 SHA256 996fbaec53973faccd9e95acbf809c020fe215cd51dd64a28bc32a4b41590a96 SHA512 bf1ed7c936d7aff9ea734c578c2015614e2132cb51e8f6d6d50da52c61b2d0ba702482a894ae30e278ee2ee0fb344126d8fca0fc7adc49adc255f132c518f3cb WHIRLPOOL ce2e98b51ddf485c8dbe7a3de2f6d34cb210025d92c91404116149d5a491b9c9252de1efd18708fe05cf4c6855f98f19a8fd5431824dc9f13b94d67369bc57b2
 AUX prepare_mplayer.sh 758 SHA256 d8a92d83db920a3e47b864b24e78407c1ef5b2c523e91dceae2d96f5bcce435e SHA512 eea43b7816080b0ffbe48db56fffa4606c98ecf8ce8a44bd02b405b5744c024ef55705f53710b8d7b2750a1b7565905f5fa572c34982e1db66810c392584520c WHIRLPOOL 09b1c09fd5264887c5d59b8dbdb5cd08811f4d952bb254dcb4649e3a55d248b8f43c49c9da9d98caad6a5578f15e0e1b40f1d44826cf60cb338bf7b049c26ddb
 DIST MPlayer-1.1.tar.xz 11208088 SHA256 76cb47eadb52b420ca028276ebd8112114ad0ab3b726af60f07fb2f39dae6c9c SHA512 8a9b96155e6794273b1496ff4987b65db14cd5ba4359b52604c2afccc574d0a2328e86f2edf98e65283c380780b9a8b3094da18a161cf7aee090986d5776178a WHIRLPOOL 4555281efc31bf74d6a4eaf63eaf9ff1555fcb65889167ffc889b34dd341bba9437c95a1a556dd4aa291f23aa5ec705a6d110ce38bee79f7198e00346793a58f
 DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
@@ -21,25 +22,15 @@ DIST mplayer-1.0_rc4_p20120405.tar.xz 5449560 SHA256 8da4ad1daa5c9b70884f775406c
 EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20417 SHA256 6041d8cffc438f974c5dbe4a288c1d1150f4e57580350b157aac331c889a8f5e SHA512 56cb232cba9a34412f27402f90e92041953f9475e6969eca77f3785bfadf72f9943480adfa2128091f468942237ac85bdfac8667cb581e24af391b2e690041d9 WHIRLPOOL 37630c6cb096da5f2dbfdc4eb016173415a52ca73468b69f5153d174e84feed8ebc1329343d29a8da4796e98bb75f893e583f17ff8b6df2624a7295238ec39f7
 EBUILD mplayer-1.0_rc4_p20120213.ebuild 17809 SHA256 6cc016d7af8980f09044137a18e2ae4b698710fc0de16ccd6da8ecd74649b30d SHA512 15c3f093de1e09fda757618dad9e8bcacec39aa126ab25a4a2afb8704a93a37c1dbe37954218deb103ea46dd9120fec90bb36863348c977a02af5f0b9cbfc952 WHIRLPOOL 64d77e04a94bbc15b2b6e5995f580852f69e4904bf4cd7422e36137f6d33ec41c3aafc99f0981855f6772b8e9d47656f26201deff55af76f460f839e0e93ee11
 EBUILD mplayer-1.0_rc4_p20120405.ebuild 17909 SHA256 b299103dbaa39026133d2e985d61de2b5ea46c692ad8031098e92b34f88beef7 SHA512 79a76c4ddde85c2cf3a4d77bb2530c82f1bd023ea9ec6f25c3700bce542540130a309fcfad5a879910f036b1c739c4628a0d492c7fb479847cc280e3881b1c63 WHIRLPOOL 606cbfc2f8d709e4abb1bfe5a7ce9cccbab3a1354dc8564f9376832855ecb945b2974058c618564e93c5c083ef633e76da53503baff8a342930786efc9a5abe6
-EBUILD mplayer-1.1-r1.ebuild 18468 SHA256 ae4c1b97fe8f407b19704daa482a7367c8718919a84cbc8a803ca86b7672819e SHA512 cb8589c5727af700de50532589bc5641d0aff281ebad3c8b2ed2d27308598a50d66322a703938e29b29c4aebbae2a4c9b7e27da8e7c83d551405455e68545a57 WHIRLPOOL 30fc60b431dfdd6b98b405f9051411bce0753a9fddedef765735501712d6bbf63d241d7a22e58e3e59b6874d7dd74a278b56b6a4b4fa3fb80cc01b6a195ccf76
+EBUILD mplayer-1.1-r1.ebuild 18500 SHA256 1951537b9763841f66a3f5fd4611a7e0151ef5f552079efe73194d2c9cb66840 SHA512 a6a7242eaa67e32ad4aafe5a5a71e5dbfd959192525c5bec1d8041e434731318a8566c56a3423e9d2ad0f5f491f34eecc0011ba3740a84c21f8d82bb5a21ec1f WHIRLPOOL 2abc87c7a133a8d4e695d4cfa9be0aeec6c9aab67ad6e8b7d0a5dc2ee39772c59177ce4eba4645ba2686b289288e8b6879a8b321cb496af23b55313e049664e1
 EBUILD mplayer-9999.ebuild 17671 SHA256 5c53e6df8311dc6f9720dff36bc1398c98081f30d20f353233461b9b1cbe038b SHA512 dfd6379a1b3c5cab08db0df0f85620879611631af9c324179b6810a0448626f061163928a0e3455c3974f4dbd12989576b05cfdd01f74834eb3af619cc10285d WHIRLPOOL 5462428f499009a637b9a84263b83b1b08c868a4b704a83884676448dbcd88833383ca9e924cc90667d0b444818b4f45adde23d69ac113ec5cd662949cd99fb4
-MISC ChangeLog 44519 SHA256 9e7d7c17958b09cc0f300cbb96dcd0b314c65dc60b0caac96500a80a83c61537 SHA512 7e72d9c4a038ecf64ffb60bed43a69eeab46d80ed88822ef2cc65674f5b7e0eb122b2c4ef574546761741dfe1fdad55e069ddbc218b468e2d39071e5207225a0 WHIRLPOOL f91e5474e89e9fa1b97f7821ee406fbdd468332e8a1b2c900872fdcf9044bcd897e2150004a37b1528d0a7d98471c0b40aefed54a3fdbb881d356ab3caa04db5
+MISC ChangeLog 44661 SHA256 cde751fdfc97728ea205d701f0f84bf050d9d4bd06e674ab8f751001186fd282 SHA512 9b6af0184756b4c05b389f6dea55cb23908e02e3b067d8ae940ebff0c56724f295146a01e88c0dc25d4234ee432a1e986cd390dd997d945ea8a091a403bfdd95 WHIRLPOOL addc59efbbc791e21fb3181086ee408cf013ac28ad095bda80529891ee4a67150f34827da373f3643e99951eaa83c0f78fdce4b9bd449bfa32d6b5f10144ec80
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
 MISC metadata.xml 3504 SHA256 504d1f70863183cfdd1c5a00f86a2980be675675b7b6c4891b75f1c9f7993a21 SHA512 03662c349a7316c0ac7eff61c2a73c953e9c2e8989d0b76c0f31ddbaf6289a4ba308ac58f59fe71cdf132d55846ae13d6dd1b4023a4a9a278329665f4339f962 WHIRLPOOL f987c3c30783289a9109fb58dddda5a128a0233fa36a8d110b943b8893c75706f757fd7b85e78539dc239989cda069457ec5ea2a9419f19a40a0a9b80788b020
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ9tpwAAoJEOSiRoyO7jvo/5oP/iXzvB82vpdUMA3FKac7zYPz
-7no/dFDflmfQw3wGVfySCbSnojSrh3kBN/Lsr6hh2XBfhkljPyk/VdWXepEjH99B
-HDQDSbUZQygEuzaA5FvjnizV5s03ypaA3XKCIezXh80XkYMATU8nPtRmEbWjE+Ah
-IbBZNY3aPJZpaEIPFrEbCAcWzmdV4f1bp0J4iOeJrEptavZSfLC3+sjtJPLLAhf1
-IkalwlAICtyOFnS/1m/qWgiLpfynzaJH4BHn2XSQZlYchRP46tcNjlAlLLvwIMJ3
-0fhz5RjSeKbyZoOcST/GKEjsTR2TKJl5idXrOcZrDj2D3dbjW+zrVaR0pfqWLL/N
-FlPsyPS+/YcOIDZt3Ki6yEYklGzTzGMFs01e70L504p0e/E0sEjl3hNzGCAjrijG
-CcTgUYck8BNF24XHZsJiZ7HJAENKdMOr5zAzrarcAfKeA5ECsvHlOYbwDjbNOKHi
-sDI3TA2t4G9m+w93tExTk6oAdIOGOiJmZCvWfBXnGr7LZA/fycJJLnTqWtdlZ20O
-Yw7ScTNtdR3afgUWi+MbICUNmQb8ETbInvBT6UtDGBwP6ybhLMhNExNQrlZShHGg
-cm+oyFWzLha7D/lTm2MLogg00OmTQ/aZhcMvyOFfVzGKHpaGnY9GKoIVGkKI1TZp
-lWcGtfFUqPf8PyLRm3Yd
-=mj1X
+iF4EAREIAAYFAlD3viAACgkQcXOrnRGRc44NygD/dgbGgtYV6qWRfMm1SxS/T7Ed
+ONETH48qFjj+e0yNmaUA/RObqIWcnoCQb0IadFMSWqMfn/wxqMHzUfut5/qSqZpB
+=+tks
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/files/mplayer-1.1-libav-9.patch b/media-video/mplayer/files/mplayer-1.1-libav-9.patch
new file mode 100644
index 000000000000..557a1e064613
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.1-libav-9.patch
@@ -0,0 +1,488 @@
+diff -urN MPlayer-1.1.orig//av_opts.c MPlayer-1.1/av_opts.c
+--- MPlayer-1.1.orig//av_opts.c	2012-01-28 14:51:57.000000000 +0100
++++ MPlayer-1.1/av_opts.c	2013-01-17 09:29:34.472213703 +0100
+@@ -42,7 +42,7 @@
+         arg     = strchr(str, '=');
+         if(arg)      *arg++= 0;
+ 
+-        if(av_set_string3(v, str, arg, 0, NULL) < 0){
++        if(av_opt_set(v, str, arg, 0) < 0){
+             free(start);
+             return -1;
+         }
+diff -urN MPlayer-1.1.orig//bstr.c MPlayer-1.1/bstr.c
+--- MPlayer-1.1.orig//bstr.c	2010-07-19 00:00:48.000000000 +0200
++++ MPlayer-1.1/bstr.c	2013-01-17 09:43:10.787183988 +0100
+@@ -18,6 +18,7 @@
+ 
+ #include <string.h>
+ #include <libavutil/avutil.h>
++#include <libavutil/common.h>
+ 
+ #include "bstr.h"
+ 
+diff -urN MPlayer-1.1.orig//codec-cfg.c MPlayer-1.1/codec-cfg.c
+--- MPlayer-1.1.orig//codec-cfg.c	2012-05-08 12:56:22.000000000 +0200
++++ MPlayer-1.1/codec-cfg.c	2013-01-17 09:34:39.860202586 +0100
+@@ -54,6 +54,7 @@
+ #include "help_mp.h"
+ 
+ #include "libavutil/avutil.h"
++#include "libavutil/common.h"
+ #include "libmpcodecs/img_format.h"
+ #include "codec-cfg.h"
+ 
+diff -urN MPlayer-1.1.orig//fmt-conversion.c MPlayer-1.1/fmt-conversion.c
+--- MPlayer-1.1.orig//fmt-conversion.c	2013-01-17 09:16:03.213243232 +0100
++++ MPlayer-1.1/fmt-conversion.c	2013-01-17 09:28:32.490215959 +0100
+@@ -26,134 +26,134 @@
+ 
+ static const struct {
+     int fmt;
+-    enum PixelFormat pix_fmt;
++    enum AVPixelFormat pix_fmt;
+ } conversion_map[] = {
+-    {IMGFMT_ARGB,    PIX_FMT_ARGB},
+-    {IMGFMT_BGRA,    PIX_FMT_BGRA},
+-    {IMGFMT_BGR24,   PIX_FMT_BGR24},
+-    {IMGFMT_BGR16BE, PIX_FMT_RGB565BE},
+-    {IMGFMT_BGR16LE, PIX_FMT_RGB565LE},
+-    {IMGFMT_BGR15BE, PIX_FMT_RGB555BE},
+-    {IMGFMT_BGR15LE, PIX_FMT_RGB555LE},
+-    {IMGFMT_BGR12BE, PIX_FMT_RGB444BE},
+-    {IMGFMT_BGR12LE, PIX_FMT_RGB444LE},
+-    {IMGFMT_BGR8,    PIX_FMT_RGB8},
+-    {IMGFMT_BGR4,    PIX_FMT_RGB4},
+-    {IMGFMT_BGR1,    PIX_FMT_MONOBLACK},
+-    {IMGFMT_RGB1,    PIX_FMT_MONOBLACK},
+-    {IMGFMT_RG4B,    PIX_FMT_BGR4_BYTE},
+-    {IMGFMT_BG4B,    PIX_FMT_RGB4_BYTE},
+-    {IMGFMT_RGB48LE, PIX_FMT_RGB48LE},
+-    {IMGFMT_RGB48BE, PIX_FMT_RGB48BE},
+-    {IMGFMT_ABGR,    PIX_FMT_ABGR},
+-    {IMGFMT_RGBA,    PIX_FMT_RGBA},
+-    {IMGFMT_RGB24,   PIX_FMT_RGB24},
+-    {IMGFMT_RGB16BE, PIX_FMT_BGR565BE},
+-    {IMGFMT_RGB16LE, PIX_FMT_BGR565LE},
+-    {IMGFMT_RGB15BE, PIX_FMT_BGR555BE},
+-    {IMGFMT_RGB15LE, PIX_FMT_BGR555LE},
+-    {IMGFMT_RGB12BE, PIX_FMT_BGR444BE},
+-    {IMGFMT_RGB12LE, PIX_FMT_BGR444LE},
+-    {IMGFMT_RGB8,    PIX_FMT_BGR8},
+-    {IMGFMT_RGB4,    PIX_FMT_BGR4},
+-    {IMGFMT_BGR8,    PIX_FMT_PAL8},
+-// NB: This works only because PIX_FMT_0RGB32 is a CPP Macro.
+-//     note that most other PIX_FMT values are enums
+-#ifdef PIX_FMT_0RGB32
+-    {IMGFMT_BGR32,   PIX_FMT_0RGB32},
+-    {IMGFMT_BGRA,    PIX_FMT_BGR0},
+-    {IMGFMT_RGBA,    PIX_FMT_RGB0},
+-    {IMGFMT_RGB64LE, PIX_FMT_RGBA64LE},
+-    {IMGFMT_RGB64BE, PIX_FMT_RGBA64BE},
++    {IMGFMT_ARGB,    AV_PIX_FMT_ARGB},
++    {IMGFMT_BGRA,    AV_PIX_FMT_BGRA},
++    {IMGFMT_BGR24,   AV_PIX_FMT_BGR24},
++    {IMGFMT_BGR16BE, AV_PIX_FMT_RGB565BE},
++    {IMGFMT_BGR16LE, AV_PIX_FMT_RGB565LE},
++    {IMGFMT_BGR15BE, AV_PIX_FMT_RGB555BE},
++    {IMGFMT_BGR15LE, AV_PIX_FMT_RGB555LE},
++    {IMGFMT_BGR12BE, AV_PIX_FMT_RGB444BE},
++    {IMGFMT_BGR12LE, AV_PIX_FMT_RGB444LE},
++    {IMGFMT_BGR8,    AV_PIX_FMT_RGB8},
++    {IMGFMT_BGR4,    AV_PIX_FMT_RGB4},
++    {IMGFMT_BGR1,    AV_PIX_FMT_MONOBLACK},
++    {IMGFMT_RGB1,    AV_PIX_FMT_MONOBLACK},
++    {IMGFMT_RG4B,    AV_PIX_FMT_BGR4_BYTE},
++    {IMGFMT_BG4B,    AV_PIX_FMT_RGB4_BYTE},
++    {IMGFMT_RGB48LE, AV_PIX_FMT_RGB48LE},
++    {IMGFMT_RGB48BE, AV_PIX_FMT_RGB48BE},
++    {IMGFMT_ABGR,    AV_PIX_FMT_ABGR},
++    {IMGFMT_RGBA,    AV_PIX_FMT_RGBA},
++    {IMGFMT_RGB24,   AV_PIX_FMT_RGB24},
++    {IMGFMT_RGB16BE, AV_PIX_FMT_BGR565BE},
++    {IMGFMT_RGB16LE, AV_PIX_FMT_BGR565LE},
++    {IMGFMT_RGB15BE, AV_PIX_FMT_BGR555BE},
++    {IMGFMT_RGB15LE, AV_PIX_FMT_BGR555LE},
++    {IMGFMT_RGB12BE, AV_PIX_FMT_BGR444BE},
++    {IMGFMT_RGB12LE, AV_PIX_FMT_BGR444LE},
++    {IMGFMT_RGB8,    AV_PIX_FMT_BGR8},
++    {IMGFMT_RGB4,    AV_PIX_FMT_BGR4},
++    {IMGFMT_BGR8,    AV_PIX_FMT_PAL8},
++// NB: This works only because AV_PIX_FMT_0RGB32 is a CPP Macro.
++//     note that most other AV_PIX_FMT values are enums
++#ifdef AV_PIX_FMT_0RGB32
++    {IMGFMT_BGR32,   AV_PIX_FMT_0RGB32},
++    {IMGFMT_BGRA,    AV_PIX_FMT_BGR0},
++    {IMGFMT_RGBA,    AV_PIX_FMT_RGB0},
++    {IMGFMT_RGB64LE, AV_PIX_FMT_RGBA64LE},
++    {IMGFMT_RGB64BE, AV_PIX_FMT_RGBA64BE},
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 50, 0)
+-    {IMGFMT_422A,    PIX_FMT_YUVA422P},
++    {IMGFMT_422A,    AV_PIX_FMT_YUVA422P},
+ #endif
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 35, 101)
+-    {IMGFMT_444A,    PIX_FMT_YUVA444P},
++    {IMGFMT_444A,    AV_PIX_FMT_YUVA444P},
+ #endif
+ #endif
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
+-    {IMGFMT_GBR24P,  PIX_FMT_GBRP},
++    {IMGFMT_GBR24P,  AV_PIX_FMT_GBRP},
+ #endif
+-    {IMGFMT_YUY2,    PIX_FMT_YUYV422},
+-    {IMGFMT_UYVY,    PIX_FMT_UYVY422},
+-    {IMGFMT_NV12,    PIX_FMT_NV12},
+-    {IMGFMT_NV21,    PIX_FMT_NV21},
+-    {IMGFMT_Y800,    PIX_FMT_GRAY8},
+-    {IMGFMT_Y8,      PIX_FMT_GRAY8},
+-    {IMGFMT_YVU9,    PIX_FMT_YUV410P},
+-    {IMGFMT_IF09,    PIX_FMT_YUV410P},
+-    {IMGFMT_YV12,    PIX_FMT_YUV420P},
+-    {IMGFMT_I420,    PIX_FMT_YUV420P},
+-    {IMGFMT_IYUV,    PIX_FMT_YUV420P},
+-    {IMGFMT_411P,    PIX_FMT_YUV411P},
+-    {IMGFMT_422P,    PIX_FMT_YUV422P},
+-    {IMGFMT_444P,    PIX_FMT_YUV444P},
+-    {IMGFMT_440P,    PIX_FMT_YUV440P},
+-
+-    {IMGFMT_420A,  PIX_FMT_YUVA420P},
+-
+-    {IMGFMT_420P16_LE,  PIX_FMT_YUV420P16LE},
+-    {IMGFMT_420P16_BE,  PIX_FMT_YUV420P16BE},
+-    {IMGFMT_420P10_LE,  PIX_FMT_YUV420P10LE},
+-    {IMGFMT_420P10_BE,  PIX_FMT_YUV420P10BE},
+-    {IMGFMT_420P9_LE,   PIX_FMT_YUV420P9LE},
+-    {IMGFMT_420P9_BE,   PIX_FMT_YUV420P9BE},
+-    {IMGFMT_422P16_LE,  PIX_FMT_YUV422P16LE},
+-    {IMGFMT_422P16_BE,  PIX_FMT_YUV422P16BE},
+-    {IMGFMT_422P10_LE,  PIX_FMT_YUV422P10LE},
+-    {IMGFMT_422P10_BE,  PIX_FMT_YUV422P10BE},
+-    {IMGFMT_422P9_LE,   PIX_FMT_YUV422P9LE},
+-    {IMGFMT_422P9_BE,   PIX_FMT_YUV422P9BE},
+-    {IMGFMT_444P16_LE,  PIX_FMT_YUV444P16LE},
+-    {IMGFMT_444P16_BE,  PIX_FMT_YUV444P16BE},
+-    {IMGFMT_444P10_LE,  PIX_FMT_YUV444P10LE},
+-    {IMGFMT_444P10_BE,  PIX_FMT_YUV444P10BE},
+-    {IMGFMT_444P9_LE,   PIX_FMT_YUV444P9LE},
+-    {IMGFMT_444P9_BE,   PIX_FMT_YUV444P9BE},
++    {IMGFMT_YUY2,    AV_PIX_FMT_YUYV422},
++    {IMGFMT_UYVY,    AV_PIX_FMT_UYVY422},
++    {IMGFMT_NV12,    AV_PIX_FMT_NV12},
++    {IMGFMT_NV21,    AV_PIX_FMT_NV21},
++    {IMGFMT_Y800,    AV_PIX_FMT_GRAY8},
++    {IMGFMT_Y8,      AV_PIX_FMT_GRAY8},
++    {IMGFMT_YVU9,    AV_PIX_FMT_YUV410P},
++    {IMGFMT_IF09,    AV_PIX_FMT_YUV410P},
++    {IMGFMT_YV12,    AV_PIX_FMT_YUV420P},
++    {IMGFMT_I420,    AV_PIX_FMT_YUV420P},
++    {IMGFMT_IYUV,    AV_PIX_FMT_YUV420P},
++    {IMGFMT_411P,    AV_PIX_FMT_YUV411P},
++    {IMGFMT_422P,    AV_PIX_FMT_YUV422P},
++    {IMGFMT_444P,    AV_PIX_FMT_YUV444P},
++    {IMGFMT_440P,    AV_PIX_FMT_YUV440P},
++
++    {IMGFMT_420A,  AV_PIX_FMT_YUVA420P},
++
++    {IMGFMT_420P16_LE,  AV_PIX_FMT_YUV420P16LE},
++    {IMGFMT_420P16_BE,  AV_PIX_FMT_YUV420P16BE},
++    {IMGFMT_420P10_LE,  AV_PIX_FMT_YUV420P10LE},
++    {IMGFMT_420P10_BE,  AV_PIX_FMT_YUV420P10BE},
++    {IMGFMT_420P9_LE,   AV_PIX_FMT_YUV420P9LE},
++    {IMGFMT_420P9_BE,   AV_PIX_FMT_YUV420P9BE},
++    {IMGFMT_422P16_LE,  AV_PIX_FMT_YUV422P16LE},
++    {IMGFMT_422P16_BE,  AV_PIX_FMT_YUV422P16BE},
++    {IMGFMT_422P10_LE,  AV_PIX_FMT_YUV422P10LE},
++    {IMGFMT_422P10_BE,  AV_PIX_FMT_YUV422P10BE},
++    {IMGFMT_422P9_LE,   AV_PIX_FMT_YUV422P9LE},
++    {IMGFMT_422P9_BE,   AV_PIX_FMT_YUV422P9BE},
++    {IMGFMT_444P16_LE,  AV_PIX_FMT_YUV444P16LE},
++    {IMGFMT_444P16_BE,  AV_PIX_FMT_YUV444P16BE},
++    {IMGFMT_444P10_LE,  AV_PIX_FMT_YUV444P10LE},
++    {IMGFMT_444P10_BE,  AV_PIX_FMT_YUV444P10BE},
++    {IMGFMT_444P9_LE,   AV_PIX_FMT_YUV444P9LE},
++    {IMGFMT_444P9_BE,   AV_PIX_FMT_YUV444P9BE},
+ 
+     // YUVJ are YUV formats that use the full Y range and not just
+     // 16 - 235 (see colorspaces.txt).
+     // Currently they are all treated the same way.
+-    {IMGFMT_YV12,  PIX_FMT_YUVJ420P},
+-    {IMGFMT_422P,  PIX_FMT_YUVJ422P},
+-    {IMGFMT_444P,  PIX_FMT_YUVJ444P},
+-    {IMGFMT_440P,  PIX_FMT_YUVJ440P},
+-
+-    {IMGFMT_XVMC_MOCO_MPEG2, PIX_FMT_XVMC_MPEG2_MC},
+-    {IMGFMT_XVMC_IDCT_MPEG2, PIX_FMT_XVMC_MPEG2_IDCT},
+-    {IMGFMT_VDPAU_MPEG1,     PIX_FMT_VDPAU_MPEG1},
+-    {IMGFMT_VDPAU_MPEG2,     PIX_FMT_VDPAU_MPEG2},
+-    {IMGFMT_VDPAU_H264,      PIX_FMT_VDPAU_H264},
+-    {IMGFMT_VDPAU_WMV3,      PIX_FMT_VDPAU_WMV3},
+-    {IMGFMT_VDPAU_VC1,       PIX_FMT_VDPAU_VC1},
+-    {IMGFMT_VDPAU_MPEG4,     PIX_FMT_VDPAU_MPEG4},
+-    {0, PIX_FMT_NONE}
++    {IMGFMT_YV12,  AV_PIX_FMT_YUVJ420P},
++    {IMGFMT_422P,  AV_PIX_FMT_YUVJ422P},
++    {IMGFMT_444P,  AV_PIX_FMT_YUVJ444P},
++    {IMGFMT_440P,  AV_PIX_FMT_YUVJ440P},
++
++    {IMGFMT_XVMC_MOCO_MPEG2, AV_PIX_FMT_XVMC_MPEG2_MC},
++    {IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC_MPEG2_IDCT},
++    {IMGFMT_VDPAU_MPEG1,     AV_PIX_FMT_VDPAU_MPEG1},
++    {IMGFMT_VDPAU_MPEG2,     AV_PIX_FMT_VDPAU_MPEG2},
++    {IMGFMT_VDPAU_H264,      AV_PIX_FMT_VDPAU_H264},
++    {IMGFMT_VDPAU_WMV3,      AV_PIX_FMT_VDPAU_WMV3},
++    {IMGFMT_VDPAU_VC1,       AV_PIX_FMT_VDPAU_VC1},
++    {IMGFMT_VDPAU_MPEG4,     AV_PIX_FMT_VDPAU_MPEG4},
++    {0, AV_PIX_FMT_NONE}
+ };
+ 
+-enum PixelFormat imgfmt2pixfmt(int fmt)
++enum AVPixelFormat imgfmt2pixfmt(int fmt)
+ {
+     int i;
+-    enum PixelFormat pix_fmt;
++    enum AVPixelFormat pix_fmt;
+     for (i = 0; conversion_map[i].fmt; i++)
+         if (conversion_map[i].fmt == fmt)
+             break;
+     pix_fmt = conversion_map[i].pix_fmt;
+-    if (pix_fmt == PIX_FMT_NONE)
++    if (pix_fmt == AV_PIX_FMT_NONE)
+         mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported format %s\n", vo_format_name(fmt));
+     return pix_fmt;
+ }
+ 
+-int pixfmt2imgfmt(enum PixelFormat pix_fmt)
++int pixfmt2imgfmt(enum AVPixelFormat pix_fmt)
+ {
+     int i;
+     int fmt;
+-    for (i = 0; conversion_map[i].pix_fmt != PIX_FMT_NONE; i++)
++    for (i = 0; conversion_map[i].pix_fmt != AV_PIX_FMT_NONE; i++)
+         if (conversion_map[i].pix_fmt == pix_fmt)
+             break;
+     fmt = conversion_map[i].fmt;
+     if (!fmt)
+-        mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported PixelFormat %i\n", pix_fmt);
++        mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported AVPixelFormat %i\n", pix_fmt);
+     return fmt;
+ }
+ 
+diff -urN MPlayer-1.1.orig//fmt-conversion.h MPlayer-1.1/fmt-conversion.h
+--- MPlayer-1.1.orig//fmt-conversion.h	2011-03-01 22:44:15.000000000 +0100
++++ MPlayer-1.1/fmt-conversion.h	2013-01-17 09:28:38.120215759 +0100
+@@ -23,8 +23,8 @@
+ #include "libavutil/avutil.h"
+ #include "libavutil/samplefmt.h"
+ 
+-enum PixelFormat imgfmt2pixfmt(int fmt);
+-int pixfmt2imgfmt(enum PixelFormat pix_fmt);
++enum AVPixelFormat imgfmt2pixfmt(int fmt);
++int pixfmt2imgfmt(enum AVPixelFormat pix_fmt);
+ enum AVSampleFormat affmt2samplefmt(int fmt);
+ int samplefmt2affmt(enum AVSampleFormat sample_fmt);
+ 
+diff -urN MPlayer-1.1.orig//libaf/af_format.c MPlayer-1.1/libaf/af_format.c
+--- MPlayer-1.1.orig//libaf/af_format.c	2011-10-26 17:12:35.000000000 +0200
++++ MPlayer-1.1/libaf/af_format.c	2013-01-17 09:43:32.770183189 +0100
+@@ -34,6 +34,7 @@
+ #include "libvo/fastmemcpy.h"
+ 
+ #include "libavutil/avutil.h"
++#include "libavutil/common.h"
+ 
+ /* Functions used by play to convert the input audio to the correct
+    format */
+diff -urN MPlayer-1.1.orig//libaf/af_lavcac3enc.c MPlayer-1.1/libaf/af_lavcac3enc.c
+--- MPlayer-1.1.orig//libaf/af_lavcac3enc.c	2012-02-19 16:21:23.000000000 +0100
++++ MPlayer-1.1/libaf/af_lavcac3enc.c	2013-01-17 09:44:27.103181211 +0100
+@@ -32,6 +32,7 @@
+ #include "reorder_ch.h"
+ #include "av_helpers.h"
+ 
++#include "libavutil/common.h"
+ #include "libavcodec/avcodec.h"
+ #include "libavutil/intreadwrite.h"
+ 
+diff -urN MPlayer-1.1.orig//libmpcodecs/vf.c MPlayer-1.1/libmpcodecs/vf.c
+--- MPlayer-1.1.orig//libmpcodecs/vf.c	2012-05-30 23:08:05.000000000 +0200
++++ MPlayer-1.1/libmpcodecs/vf.c	2013-01-17 09:50:25.861168154 +0100
+@@ -40,6 +40,7 @@
+ #include "vf.h"
+ 
+ #include "libvo/fastmemcpy.h"
++#include "libavutil/common.h"
+ #include "libavutil/mem.h"
+ 
+ extern const vf_info_t vf_info_1bpp;
+diff -urN MPlayer-1.1.orig//libmpcodecs/vf_geq.c MPlayer-1.1/libmpcodecs/vf_geq.c
+--- MPlayer-1.1.orig//libmpcodecs/vf_geq.c	2011-04-19 09:32:36.000000000 +0200
++++ MPlayer-1.1/libmpcodecs/vf_geq.c	2013-01-17 09:44:01.045182161 +0100
+@@ -34,6 +34,8 @@
+ 
+ #include "libavcodec/avcodec.h"
+ #include "libavutil/eval.h"
++#include "libavutil/common.h"
++#include "libavutil/mem.h"
+ 
+ struct vf_priv_s {
+     AVExpr * e[3];
+diff -urN MPlayer-1.1.orig//libmpcodecs/vf_gradfun.c MPlayer-1.1/libmpcodecs/vf_gradfun.c
+--- MPlayer-1.1.orig//libmpcodecs/vf_gradfun.c	2010-04-06 11:46:47.000000000 +0200
++++ MPlayer-1.1/libmpcodecs/vf_gradfun.c	2013-01-17 09:47:10.679175257 +0100
+@@ -39,6 +39,7 @@
+ #include "vf.h"
+ #include "libvo/fastmemcpy.h"
+ #include "libavutil/avutil.h"
++#include "libavutil/common.h"
+ #include "libavutil/x86_cpu.h"
+ 
+ struct vf_priv_s {
+diff -urN MPlayer-1.1.orig//libmpcodecs/vf_sab.c MPlayer-1.1/libmpcodecs/vf_sab.c
+--- MPlayer-1.1.orig//libmpcodecs/vf_sab.c	2011-05-25 15:46:32.000000000 +0200
++++ MPlayer-1.1/libmpcodecs/vf_sab.c	2013-01-17 09:28:59.964214957 +0100
+@@ -32,6 +32,7 @@
+ #endif
+ 
+ #include "libavutil/avutil.h"
++#include "libavutil/mem.h"
+ #include "img_format.h"
+ #include "mp_image.h"
+ #include "vf.h"
+diff -urN MPlayer-1.1.orig//libmpcodecs/vf_screenshot.c MPlayer-1.1/libmpcodecs/vf_screenshot.c
+--- MPlayer-1.1.orig//libmpcodecs/vf_screenshot.c	2012-02-19 23:09:30.000000000 +0100
++++ MPlayer-1.1/libmpcodecs/vf_screenshot.c	2013-01-17 09:28:04.643216971 +0100
+@@ -39,6 +39,7 @@
+ 
+ #include "libswscale/swscale.h"
+ #include "libavcodec/avcodec.h"
++#include "libavutil/mem.h"
+ 
+ struct vf_priv_s {
+     int frameno;
+diff -urN MPlayer-1.1.orig//libmpdemux/demux_lavf.c MPlayer-1.1/libmpdemux/demux_lavf.c
+--- MPlayer-1.1.orig//libmpdemux/demux_lavf.c	2012-04-07 22:08:53.000000000 +0200
++++ MPlayer-1.1/libmpdemux/demux_lavf.c	2013-01-17 09:41:44.880187116 +0100
+@@ -317,20 +317,20 @@
+             sh_audio->samplerate= codec->sample_rate;
+             sh_audio->i_bps= codec->bit_rate/8;
+             switch (codec->codec_id) {
+-                case CODEC_ID_PCM_S8:
+-                case CODEC_ID_PCM_U8:
++                case AV_CODEC_ID_PCM_S8:
++                case AV_CODEC_ID_PCM_U8:
+                     sh_audio->samplesize = 1;
+                     break;
+-                case CODEC_ID_PCM_S16LE:
+-                case CODEC_ID_PCM_S16BE:
+-                case CODEC_ID_PCM_U16LE:
+-                case CODEC_ID_PCM_U16BE:
++                case AV_CODEC_ID_PCM_S16LE:
++                case AV_CODEC_ID_PCM_S16BE:
++                case AV_CODEC_ID_PCM_U16LE:
++                case AV_CODEC_ID_PCM_U16BE:
+                     sh_audio->samplesize = 2;
+                     break;
+-                case CODEC_ID_PCM_ALAW:
++                case AV_CODEC_ID_PCM_ALAW:
+                     sh_audio->format = 0x6;
+                     break;
+-                case CODEC_ID_PCM_MULAW:
++                case AV_CODEC_ID_PCM_MULAW:
+                     sh_audio->format = 0x7;
+                     break;
+             }
+@@ -358,7 +358,7 @@
+             priv->vstreams[priv->video_streams] = i;
+             bih=calloc(sizeof(*bih) + codec->extradata_size,1);
+ 
+-            if(codec->codec_id == CODEC_ID_RAWVIDEO) {
++            if(codec->codec_id == AV_CODEC_ID_RAWVIDEO) {
+                 switch (codec->pix_fmt) {
+                     case PIX_FMT_RGB24:
+                         codec->codec_tag= MKTAG(24, 'B', 'G', 'R');
+@@ -423,24 +423,24 @@
+         case AVMEDIA_TYPE_SUBTITLE:{
+             sh_sub_t* sh_sub;
+             char type;
+-            if(codec->codec_id == CODEC_ID_TEXT)
++            if(codec->codec_id == AV_CODEC_ID_TEXT)
+                 type = 't';
+-            else if(codec->codec_id == CODEC_ID_MOV_TEXT)
++            else if(codec->codec_id == AV_CODEC_ID_MOV_TEXT)
+                 type = 'm';
+-            else if(codec->codec_id == CODEC_ID_SSA)
++            else if(codec->codec_id == AV_CODEC_ID_SSA)
+                 type = 'a';
+-            else if(codec->codec_id == CODEC_ID_DVD_SUBTITLE)
++            else if(codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE)
+                 type = 'v';
+-            else if(codec->codec_id == CODEC_ID_XSUB)
++            else if(codec->codec_id == AV_CODEC_ID_XSUB)
+                 type = 'x';
+-            else if(codec->codec_id == CODEC_ID_DVB_SUBTITLE)
++            else if(codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
+                 type = 'b';
+-            else if(codec->codec_id == CODEC_ID_DVB_TELETEXT)
++            else if(codec->codec_id == AV_CODEC_ID_DVB_TELETEXT)
+                 type = 'd';
+-            else if(codec->codec_id == CODEC_ID_HDMV_PGS_SUBTITLE)
++            else if(codec->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE)
+                 type = 'p';
+-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 14, 100)
+-            else if(codec->codec_id == CODEC_ID_EIA_608)
++#if 0 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 14, 100)
++            else if(codec->codec_id == AV_CODEC_ID_EIA_608)
+                 type = 'c';
+ #endif
+             else if(codec->codec_tag == MKTAG('c', '6', '0', '8'))
+@@ -465,7 +465,7 @@
+             break;
+         }
+         case AVMEDIA_TYPE_ATTACHMENT:{
+-            if (st->codec->codec_id == CODEC_ID_TTF) {
++            if (st->codec->codec_id == AV_CODEC_ID_TTF) {
+                 AVDictionaryEntry *fnametag = av_dict_get(st->metadata, "filename", NULL, 0);
+                 demuxer_add_attachment(demuxer, fnametag ? fnametag->value : NULL,
+                                        "application/x-truetype-font",
+@@ -808,7 +808,7 @@
+                             prog->aid = program->stream_index[i];
+                         break;
+                     case AVMEDIA_TYPE_SUBTITLE:
+-                        if(prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == CODEC_ID_TEXT)
++                        if(prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == AV_CODEC_ID_TEXT)
+                             prog->sid = program->stream_index[i];
+                         break;
+                 }
+diff -urN MPlayer-1.1.orig//stream/cache2.c MPlayer-1.1/stream/cache2.c
+--- MPlayer-1.1.orig//stream/cache2.c	2012-03-04 16:11:50.000000000 +0100
++++ MPlayer-1.1/stream/cache2.c	2013-01-17 09:30:01.501212718 +0100
+@@ -40,6 +40,7 @@
+ #include <errno.h>
+ 
+ #include "libavutil/avutil.h"
++#include "libavutil/common.h"
+ #include "osdep/shmem.h"
+ #include "osdep/timer.h"
+ #if defined(__MINGW32__)
+diff -urN MPlayer-1.1.orig//sub/spudec.c MPlayer-1.1/sub/spudec.c
+--- MPlayer-1.1.orig//sub/spudec.c	2012-04-23 20:39:16.000000000 +0200
++++ MPlayer-1.1/sub/spudec.c	2013-01-17 09:46:50.054176009 +0100
+@@ -42,6 +42,7 @@
+ #include "spudec.h"
+ #include "vobsub.h"
+ #include "libavutil/avutil.h"
++#include "libavutil/common.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libswscale/swscale.h"
+ 
+diff -urN MPlayer-1.1.orig//sub/sub_cc.c MPlayer-1.1/sub/sub_cc.c
+--- MPlayer-1.1.orig//sub/sub_cc.c	2012-04-07 22:08:53.000000000 +0200
++++ MPlayer-1.1/sub/sub_cc.c	2013-01-17 09:46:31.413176687 +0100
+@@ -42,6 +42,7 @@
+ #include "sub.h"
+ 
+ #include "libavutil/avutil.h"
++#include "libavutil/common.h"
+ 
+ 
+ #define CC_MAX_LINE_LENGTH 64
diff --git a/media-video/mplayer/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild
index 719f6acb2070..fa0e675cd139 100644
--- a/media-video/mplayer/mplayer-1.1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.14 2013/01/16 16:44:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.15 2013/01/17 09:01:57 lu_zero Exp $
 
 EAPI=4
 
@@ -195,6 +195,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.0_rc4-pkg-config.patch"
 	"${FILESDIR}/${P}-ffmpeg.patch"
 	"${FILESDIR}/${P}-libav-0.8.patch"
+	"${FILESDIR}/${P}-libav-9.patch"
 	"${FILESDIR}/${P}-codecid.patch"
 )