Fix building with newer libav #538500 by Patrick Lauer.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

5 files changed, 253 insertions, 18 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index e27c2cca97ad..5d47007dd370 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/transcode
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.326 2015/02/17 02:54:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.327 2015/02/17 03:26:28 vapier Exp $
+
+  17 Feb 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/transcode-1.1.7-libav-10.patch, files/transcode-1.1.7-ffmpeg2.patch,
+  transcode-1.1.7-r3.ebuild:
+  Fix building with newer libav #538500 by Patrick Lauer.
 
   17 Feb 2015; Mike Frysinger <vapier@gentoo.org>
   files/transcode-1.1.7-ffmpeg2.patch:
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index a3f8b98f9bd1..f19ff29c7ff6 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -4,32 +4,33 @@ Hash: SHA256
 AUX transcode-1.1.7-ffmpeg-0.10.patch 402 SHA256 5df30ce0bdaee1d61a5dd94d242ce010dc043305553519a1532c33b2628ec308 SHA512 d15a222ac21ba91758cdd8c7e43188cfa5fb015d3bdf2c74290b26e5fc12a5899f6a6ac59a9763ee8009ed7fb8fcf4b3dc9ec4f4cc5ca8049bd5f437e7b725bf WHIRLPOOL fc06332d4f2037083f57edfbcd71515fd6d9d64a03bceb3a71ab7d44b795c01eb6cfa8675a27bbe252fa12650dbca5b7100b04f78df3f5515f3827bf59fe88fa
 AUX transcode-1.1.7-ffmpeg-0.11.patch 12718 SHA256 52f62257ad3abcaf72b306549f66b3aee2a38d2b84713b42be26b7fdcd5f203d SHA512 9b39f15d20830fb57f86750a54a5a7c6025ad69733d668df45a06fd1134e0a6ee76a495a883797b41870b156b4b8895a4dcedbd5e28712d69a98baa7b5934663 WHIRLPOOL 11905b35e3b4b24e8e779945d81743520c554c0c8653d466db095d0d02510c2f6a00ce8d632f8993d829607d37ec8887e79401f6da230f1e8352bad7e55b0fe1
 AUX transcode-1.1.7-ffmpeg.patch 2274 SHA256 443776bbc3497e1f256eb74c19bcda293cfd751776817bafc1ca89ff510e3b61 SHA512 d238b645b27bb83e2a1753b9dc99909084292579b757831d560f9535f1eb4a4892bd89047f0b23625f66e72fe8d373002abf8a6a03334c720b065af4220f5a9a WHIRLPOOL edbec136aa7a53a8119f42c9a2f8f000a743e9045892f160dfa4e513137c9e10c16c0316894874bfeb9026f5f10345fb9b920ff1e5111eedec84f85ae9f680ae
-AUX transcode-1.1.7-ffmpeg2.patch 15266 SHA256 ea5ee6ead830a0fc5f6a28bab74ebfdce2aa014f733a415185b5547b1288f963 SHA512 4917d6b0fc02e1dfb56d712b39eb5abac4f70dccc8e4293d68269d6c3d934ba8fb9bca9af82c8112ea044d8bdb1fef1ce2a628c020d61bdfab838619b488b58f WHIRLPOOL dd22f9de98a0ca67acfb1f156c4a8ee323509eda6f3021692cde4b982e052de7992fbe7781305fdafb4761a84ecf9c514fb7ec141373d4892efb0b1f741fb36f
+AUX transcode-1.1.7-ffmpeg2.patch 21823 SHA256 47dd5d276cf9accf9b7210cb0a94b792629b542833499435fc266c88dc244e5e SHA512 d1ee8c3d22a34930665857f63cef3925e0dfe50aef0bd15b0a1c835d182ec3e33c615915b4cb202fb201fad7edfe1c960466bb399803f4a9eb097b87d2b26605 WHIRLPOOL d6dea0550e49229f25005da380deeec00e810abb50762490326d9f2f71c71ac395f9d7e420d1a7cd9d8e1fe43c754ef5429caa84e2c12be12657fc0602ac60e8
 AUX transcode-1.1.7-ffmpeg24.patch 544 SHA256 d54c943bb088f2457b69919ed97fa7cb0fd1a6700d4c67fdeafff3f14f726fcb SHA512 2d3a10b8022b8bc67678d303ecefea05e4fa95c4c376264e2ef45446b4e7b48485672cb370b5aff7127ad80c1331dd3e422dad17124b099b20e368d4d57259a1 WHIRLPOOL e388afa480b54626d7bc2f5fed91bca1aa3dae2a7d645e12f7a709aca553a3b32cded3f858b29b545c9cc0987df8664c1b769dba84532c28f9d010c1ca7ce169
 AUX transcode-1.1.7-freetype251.patch 273 SHA256 0dd6baea9fc401a59fab3f848f256015ccf4e420224969647f2a79fb208621f1 SHA512 40b672e15de03d2f9f9150a3edb61de65f2d37f6fa9c8b0fc5f47d5a8c8dc6feb714163689947e8997ff4d6c243aa5a5ec860ef8c50bf4648166aa64a7396285 WHIRLPOOL 8f03d793695cb9d3e7e5d7c54c70a21dab2367cd472730b898ef758116a1c14951348333a8c1fcde5ec6d2330242c55c8d08cdd0821deee147b133604b438128
+AUX transcode-1.1.7-libav-10.patch 1187 SHA256 99a439ffb4c37f1c2019aed202f0b662e96ded32e4bd4f4515e6035dc63612c8 SHA512 19d64521bc08e1217234e32ec593b1af007b3af4c3728dcaef0ffb3dab2687c0b674b9c0c9fa9f0586422007548b37ada8a452ae5f97ac9a9460b52eaef4bae8 WHIRLPOOL 7a32c615962af8eefb74a2cc26c02080438f8b659a5f0dca63be717a476b443caf93b7a0cedd9581ae34be73aac0f3cdc6b2c9fa7e2afc3576e228ae4ba98161
 AUX transcode-1.1.7-libav-9.patch 1413 SHA256 9a53c93b1efa1a6ee6fbe30acbcce4416024d8aa857771d258ddb444f30b48ce SHA512 0868e1b8f440ef8d9314851e02211edc77c3c410b2ec9e860b74cb159d0ea7a77590a933e6ad29b4df5bf8b8ea78f13dae8aa79f361c5437a89b1ba02c7b6e36 WHIRLPOOL 38557b8c2c286bb5a3982c02c229c319114aa6914eb20745127a83a3eb679c7d4d5c989e3661343bba68ad56717842f05da2ea2269ed53e764b708b736b7af29
 AUX transcode-1.1.7-preset-force.patch 1199 SHA256 fe95e83093761924ba0fa5b3214e169812f7740c6c3c434845b1b563d4a37241 SHA512 b2406841674b0d021b1a116e3ef1d16a7206db0930d10d98f3a86923040fbe306296acbac1e14020557c0e9b7e9b28bd0de1f9e1ce20c7fb2c190d15adc6decc WHIRLPOOL e7742ba9dd8a9355f64d640d1005f8713dde5d0ec896583792e73ef0143087d0bbd09673df97c7b65bfe637dbc9ddd2afa1c9786725061440de93b94f7500781
 AUX transcode-1.1.7-preset-free.patch 1370 SHA256 2219fe618be2b2c3fbd6e3545cdbd8db8d1c268a0b37bfe867514f871d7d91ef SHA512 46514728ea0970bf69ef0341ea64dae495a1a571a0416cf20cfaa7c922ded0ae8dcfd717c720c53e457a16585722973266e5cc0b509034ed2549338dc9bac912 WHIRLPOOL d7247d7e506bc5fd2ed579d934ceb121a54c93683de143b7c4ffbdd4b33799acc9c1b4e93e90db4788c84bc4320be05ae90d2760a86a979ae1f57fd4e3bf3750
 DIST transcode-1.1.7.tar.bz2 2183627 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f WHIRLPOOL ccd085b3a2638de92c2d589ff93038fed3d1a760d3513fde2946a805f7efed87813850f5e9eee306ed8efd3608ad9492d16f4c41bd6278379995deb22f92354e
 EBUILD transcode-1.1.7-r1.ebuild 3508 SHA256 98a24ed3aed172ee263f0f5da33647551dc3434a0f73875d3b22a81396c9eb04 SHA512 04401771c9c19871ac43e3219f642eb618741077f947a766f42694c7832a2a230757d3991ba11773427685433d6d506b62bfbac21f3e73ed3cb94b8a2e4d0bd8 WHIRLPOOL 932134449e7e6dd43578e97e6073236bad1be69cea80dac6e57676c9c4a24b0fa417f481f918f949356ccb3ed924c551d0dd25a6f65ad2da003b7a215037b766
 EBUILD transcode-1.1.7-r2.ebuild 3550 SHA256 33ec022cef87fb1406da39182409e53b02fda6b3a024c5146283a0dbdb217cbf SHA512 44a5b5f3509a41dd0b12d34477e8a101f4b289383be3aaedbc85cc2265ccc83f7b2640422d810505f4fd742c387ee2c42e0b66972102403ce4ef0038da93082b WHIRLPOOL 4d146fe7f67cb07958cc87f920056eb3b2cc7582313955a14c189943994197f22ae0fa3a448b2f3eedafbacaff1b61971c10229c9905862149850c706b862562
-EBUILD transcode-1.1.7-r3.ebuild 3703 SHA256 da7d1a74c9aa8753f937f583efce25b3efd43d942d4c09beb3ff1be16e8e87af SHA512 a36af67628f512576dd3886c3cb5288a87f793f3b3854bb5712fee21d16bd5f00b7f9184b7b7fb077cdc2e33fff7f7618fd8c2abb277114b8130c549e0846ffb WHIRLPOOL f0c8f08acf2e8f1ddfd9d8b35059d4a64dac12d941eda51b92b9cc4f49844d0f2d3b2283afb119f45bcf3023a1b1bed88e56538b5a3956985c7c4504adcc5406
-MISC ChangeLog 53861 SHA256 52de54225193e057b28d509c03c08863bc034fcba167511b5fb9c22c7ed280fb SHA512 b083c93ef03052bd09f233fa49846b3856d3c31adfb36f514066d410168b856ffd5501cadf5321460e3f0da293273baf8340ee7e153ed556d618f642f1419b9c WHIRLPOOL dbf8fd9988f70861e3cd9e4f0f1ba8a8345a3e227866077283e36e54a253d04d1e287461a2ec3282acc4c35870c89c195abca2ab9abc7ba133a84142448acdae
+EBUILD transcode-1.1.7-r3.ebuild 3741 SHA256 20587f570e6e89ac53b69fdce087803a073fc0576ff271cf4c7772baa5a1bd4b SHA512 679538a65e851bfea18df9f9300b8640f913ef8017c15b444b7fedd55dbc9e99cdace4baa2fed8874ba30e80871f6733823d274d6767bcaaddc933acdb4502a2 WHIRLPOOL 0efa3266210474ba86b28b9a319b1ae87e3162389b3cbd507407499ddbbbb62128bbffe9d07b47d113fd2731a12d139e5ede031211afe0e9b3f9cb4ce8217fec
+MISC ChangeLog 54077 SHA256 4353c93c26cff4ccb63189eb8d76e221e977f3b206e4eb5875dc041825ef8828 SHA512 ef5c5bd5e11b3b1692824719f38ce9e5360be8639ab5fc6f5d8790c3e3eddbbcb7035d26c4c302f3ee039b690faa55db75db865f037e52dce8b4125c43dd3aa5 WHIRLPOOL 092c6db48b241f3fd25d34ef7672c99bf694aa9eaa7fc2e46a6c816a821840118974c643d77627afd939f5b1addbd1678f037230b25853f63333b2135fcae4da
 MISC metadata.xml 529 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209 SHA512 6c5a6dd9ef9407f0c05f42cdfeaf4d3c2e2e6a4c91028331b6dd905acf1174e7bb937b780d12043f030a6afd344aef0df1a2a3d13cbda5a71724bd1f7a8b8302 WHIRLPOOL c27354b3de6c7cb67a30adac4c66e4b72726ecf3e1a1b05fa2e759ce174cfc51154dcfeb0c1b48754702e304fc95753c42ac626b0d6338021737b84bdb074385
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4q4CAAoJEPGu1DbS6WIA0ykQAIhBd8FXo6/2S+Uxy2CeMz5K
-YtHntu5bkX1cuhGRBQsdLlt+xP9AqO/MmBFY7723cRN5+xD7VEl2NIgOAfmR7LmT
-scDGZaEBsDm+OvOaGTs9LPf3j0hg9guIEWBBtOTb8njlggGs8snfpRVPfjJeFmjZ
-4iCQ7+pzTa+W8tOEdDwtXpDtim1gVgutkW1AeQp6Ea+fsGJtdaUuqzt3zzcaDjeX
-xQcxArCxOam7QvWSomTEZ3WvmbScSdVYCOUKJDrsV428CI7BZye6nbPOw2k3QlRV
-dqe/9iFnAAUefV6qSIJBJjas5cwK4iMZdBqncgoKAKHuAquFAlsAgLoFevDym6R3
-v1heW4Vfq1QrFnz5UhyeXu/BSYJGSK7pVXGMhdQ9hyOwETeTudqoFpFcxt6nRJWU
-ovu0nfI9cD3wUYLSRq+x7KOCuiVz+Qj5jgxIqZYwmrb2NgC09YSPy1OG8hETKpEY
-iOjz5sF2irZy47yrcIcRJeHJhxR+ycSJ9i3gNHh/qPmySHh2CsJWQJuRdW7Zamcj
-wZFt2dnh7K5pGe8C/OUzv5zVvsxwDBYKtjUFCvQOpWtjcZSUpxTKspoeHU7B48Zu
-b01alicqQ3qXBuf/ijTL7N2y3ZLSyMiGokcDwiiL6RWVunC6MAmasgBu8aVgFS2N
-VOK2W7w5kvaj6//y/7bC
-=Oc1T
+iQIcBAEBCAAGBQJU4rWCAAoJEPGu1DbS6WIALIcP/3aye86KXOpcAeV/Kb0+HHtG
+Xfpc/EU2vg1azHgIhZSQOKiCjSs1B/31k0kswhvroL73k+PuQ5KLNzAaKFX9PLVS
+3gvzq5iHNSSOTBag3Giy3oAuZH8OafS9HgAG5aqnAgNkeLQ16AiDM+V0Noht724T
+0L2EIx6wh7rqiZXMXXOnX9aG6sVyTW54G6Ls17W2A/R5Z78xWw245eW6GSjaOyKl
+xFKCy0jxEk1eMuQS4HcnwWJKhmRqf6NvpUVU6pFLAKxPaiwLFkxY1SGHQgo8IJvM
+pL1DgxOOtYk1qatnMbJdh66YsQULi3K6gwBD16MSzaSGLUPIlFDBAz99MOuE+BsD
+7LhTLXfXa7xiN3cZIoElhNjGAk2TI0sjtzNwFQdqr6DaBiyRI2WStOZC0sL/QUSJ
+5WAGRVGrDw+DhzCVwWd/0Vr4OUkWHuR+1DodQ7mbUSTDOnNgiIE8gmTQKNoI1KdO
+J44HDc3p9hoKx9HI3/elSKyoefff/+rhyAi2ELF97HhJl5LEUVVh91qnuNatNpMm
+bmIxqoUdsB8+qbZHsqnezZGg9aHWOxPMyNlu/ItIQFNKDVNTs+b4oONmO1IHTSpb
+jP5lcQRWR3eLq66FRA174kAZLQ9vMX6tTdgy1cxfGCItYG7JIa2opKiOBnW9hkxj
+9PY49XK0bUWk8o5HtDwk
+=lakG
 -----END PGP SIGNATURE-----
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
index 956fc1e64e4d..9a770a6a0def 100644
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
+++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
@@ -345,6 +345,71 @@ Index: transcode-1.1.7/import/import_ffmpeg.c
 ===================================================================
 --- transcode-1.1.7.orig/import/import_ffmpeg.c
 +++ transcode-1.1.7/import/import_ffmpeg.c
+@@ -58,6 +58,7 @@ struct ffmpeg_codec {
+ };
+ 
+ // fourCC to ID mapping taken from MPlayer's codecs.conf
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ static struct ffmpeg_codec ffmpeg_codecs[] = {
+   {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
+     {"MP41", "DIV1", ""}},
+@@ -106,6 +107,56 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
+   {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
+     {"Y42B", ""}},
+   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
++#else
++static struct ffmpeg_codec ffmpeg_codecs[] = {
++  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
++    {"MP41", "DIV1", ""}},
++  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
++    {"MP42", "DIV2", ""}},
++  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
++    {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
++  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
++    {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
++  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
++    {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
++  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
++    {"MPG1", ""}},
++  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
++    {"DVSD", ""}},
++  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
++    {"WMV1", ""}},
++  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
++    {"WMV2", ""}},
++  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
++    {"HFYU", ""}},
++  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
++    {"I263", ""}},
++  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
++    {"H263", "U263", "VIV1", ""}},
++  {AV_CODEC_ID_H264, TC_CODEC_H264, "h264",
++    {"H264", "h264", "X264", "x264", "avc1", ""}},
++  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
++    {"RV10", "RV13", ""}},
++  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
++    {"SVQ1", ""}},
++  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
++    {"SVQ3", ""}},
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
++    {"MPG2", ""}},
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
++    {"MPG2", ""}},
++  {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
++    {"ASV1", ""}},
++  {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
++    {"ASV2", ""}},
++  {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
++    {"FFV1", ""}},
++  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
++    {"I420", "IYUV", ""}},
++  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
++    {"Y42B", ""}},
++  {0, TC_CODEC_UNKNOWN, NULL, {""}}};
++#endif
+ 
+ #define BUFFER_SIZE SIZE_RGB_FRAME
+ 
 @@ -302,7 +302,7 @@ do_avi:
  
      // Set these to the expected values so that ffmpeg's decoder can
@@ -354,6 +419,30 @@ Index: transcode-1.1.7/import/import_ffmpeg.c
      if (lavc_dec_context == NULL) {
        tc_log_error(MOD_NAME, "Could not allocate enough memory.");
        return TC_IMPORT_ERROR;
+@@ -324,6 +375,7 @@ do_avi:
+     // XXX: some codecs need extra data
+     switch (codec->id)
+     {
++#if LIBAVCODEC_VERSION_MAJOR < 55
+       case CODEC_ID_MJPEG: extra_data_size  = 28; break;
+       case CODEC_ID_LJPEG: extra_data_size  = 28; break;
+       case CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
+@@ -331,6 +383,15 @@ do_avi:
+       case CODEC_ID_ASV2: extra_data_size = 8; break;
+       case CODEC_ID_WMV1: extra_data_size = 4; break;
+       case CODEC_ID_WMV2: extra_data_size = 4; break;
++#else
++      case AV_CODEC_ID_MJPEG: extra_data_size  = 28; break;
++      case AV_CODEC_ID_LJPEG: extra_data_size  = 28; break;
++      case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
++      case AV_CODEC_ID_ASV1: extra_data_size = 8; break;
++      case AV_CODEC_ID_ASV2: extra_data_size = 8; break;
++      case AV_CODEC_ID_WMV1: extra_data_size = 4; break;
++      case AV_CODEC_ID_WMV2: extra_data_size = 4; break;
++#endif
+       default: extra_data_size = 0; break;
+     }
+ 
 @@ -344,7 +344,7 @@ do_avi:
      }
  
@@ -363,3 +452,106 @@ Index: transcode-1.1.7/import/import_ffmpeg.c
      TC_UNLOCK_LIBAVCODEC;
      if (ret < 0) {
        tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.",
+@@ -360,7 +421,11 @@ do_avi:
+         frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim);
+ 
+ 	// we adapt the color space
++#if LIBAVCODEC_VERSION_MAJOR < 55
+         if(codec->id == CODEC_ID_MJPEG) {
++#else
++        if(codec->id == AV_CODEC_ID_MJPEG) {
++#endif
+ 	  enable_levels_filter();
+         }
+         break;
+@@ -434,7 +499,11 @@ do_dv:
+       }
+ 
+       // we adapt the color space
++#if LIBAVCODEC_VERSION_MAJOR < 55
+       if(codec->id == CODEC_ID_MJPEG) {
++#else
++      if(codec->id == AV_CODEC_ID_MJPEG) {
++#endif
+         enable_levels_filter();
+       }
+ 
+@@ -504,13 +573,25 @@ MOD_decode {
+       int bkey = 0;
+ 
+       // check for keyframes
++#if LIBAVCODEC_VERSION_MAJOR < 55
+       if (codec->id == CODEC_ID_MSMPEG4V3) {
++#else
++      if (codec->id == AV_CODEC_ID_MSMPEG4V3) {
++#endif
+ 	if (divx3_is_key(buffer)) bkey = 1;
+       }
++#if LIBAVCODEC_VERSION_MAJOR < 55
+       else if (codec->id == CODEC_ID_MPEG4) {
++#else
++      else if (codec->id == AV_CODEC_ID_MPEG4) {
++#endif
+ 	if (mpeg4_is_key(buffer, bytes_read)) bkey = 1;
+       }
++#if LIBAVCODEC_VERSION_MAJOR < 55
+       else if (codec->id == CODEC_ID_MJPEG) {
++#else
++      else if (codec->id == AV_CODEC_ID_MJPEG) {
++#endif
+ 	bkey = 1;
+       }
+ 
+--- a/import/decode_lavc.c
++++ b/import/decode_lavc.c
+@@ -57,6 +57,7 @@ struct ffmpeg_codec {
+ };
+ 
+ // fourCC to ID mapping taken from MPlayer's codecs.conf
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ static struct ffmpeg_codec ffmpeg_codecs[] = {
+   {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
+     {"MP41", "DIV1", ""}},
+@@ -91,6 +92,42 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
+   {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
+     {"MPG2", ""}},
+   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
++#else
++static struct ffmpeg_codec ffmpeg_codecs[] = {
++  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
++    {"MP41", "DIV1", ""}},
++  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
++    {"MP42", "DIV2", ""}},
++  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
++    {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
++  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
++    {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
++  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
++    {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
++  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",
++    {"MPG1", ""}},
++  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
++    {"DVSD", ""}},
++  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
++    {"WMV1", ""}},
++  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
++    {"WMV2", ""}},
++  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
++    {"HFYU", ""}},
++  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
++    {"I263", ""}},
++  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
++    {"H263", "U263", "VIV1", ""}},
++  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
++    {"RV10", "RV13", ""}},
++  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
++    {"SVQ1", ""}},
++  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
++    {"SVQ3", ""}},
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
++    {"MPG2", ""}},
++  {0, TC_CODEC_UNKNOWN, NULL, {""}}};
++#endif
+ 
+ 
+ static struct ffmpeg_codec *find_ffmpeg_codec_id(unsigned int transcode_id)
diff --git a/media-video/transcode/files/transcode-1.1.7-libav-10.patch b/media-video/transcode/files/transcode-1.1.7-libav-10.patch
new file mode 100644
index 000000000000..1f4a24039d79
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-libav-10.patch
@@ -0,0 +1,36 @@
+fix building w/libav-10
+
+https://wiki.libav.org/Migration/10
+
+--- a/filter/filter_resample.c
++++ b/filter/filter_resample.c
+@@ -37,6 +37,7 @@
+ #include "libtc/optstr.h"
+ #include "libtc/tcavcodec.h"
+ #include "libtc/tcmodule-plugin.h"
++#include <libavresample/avresample.h>
+ 
+ 
+ typedef struct {
+@@ -45,7 +46,7 @@ typedef struct {
+ 
+     int bytes_per_sample;
+ 
+-    ReSampleContext *resample_ctx;
++    AVAudioResampleContext *resample_ctx;
+ } ResamplePrivateData;
+ 
+ static const char resample_help[] = ""
+--- a/import/probe_ffmpeg.c
++++ b/import/probe_ffmpeg.c
+@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info)
+             info->bitrate = st->codec->bit_rate / 1000;
+             info->width = st->codec->width;
+             info->height = st->codec->height;
+-            if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) {
+-                info->fps = av_q2d(st->r_frame_rate);
++            if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) {
++                info->fps = av_q2d(st->avg_frame_rate);
+             } else {
+                 /* watch out here */
+                 info->fps = 1.0/av_q2d(st->codec->time_base);
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild
index 1dac5bba09b7..bdb2cd281a5a 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7-r3.ebuild,v 1.12 2015/02/17 01:19:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7-r3.ebuild,v 1.13 2015/02/17 03:26:28 vapier Exp $
 
 EAPI=5
 inherit eutils libtool multilib
@@ -62,6 +62,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-ffmpeg-0.11.patch \
 		"${FILESDIR}"/${P}-preset-free.patch \
 		"${FILESDIR}"/${P}-libav-9.patch \
+		"${FILESDIR}"/${P}-libav-10.patch \
 		"${FILESDIR}"/${P}-preset-force.patch \
 		"${FILESDIR}"/${P}-ffmpeg2.patch \
 		"${FILESDIR}"/${P}-freetype251.patch \