diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-09-26 13:20:01 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-09-26 13:20:01 +0000 |
| commit | b56e5656df88dc1d9312e0275cb55ad1a0d87204 (patch) | |
| tree | bf0553aaaca7ee97b890021907b6bf85c6dba870 /media-libs | |
| parent | Version bump and cleanup (fixes bug #117288). (diff) | |
| download | historical-b56e5656df88dc1d9312e0275cb55ad1a0d87204.tar.gz historical-b56e5656df88dc1d9312e0275cb55ad1a0d87204.tar.bz2 historical-b56e5656df88dc1d9312e0275cb55ad1a0d87204.zip | |
Fix the lavc patch again for bug #237234... why did I trust upstream in merging the correct patch?
Package-Manager: portage-2.2_rc10/cvs/Linux 2.6.26.5 x86_64
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libquicktime/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libquicktime/Manifest | 10 | ||||
| -rw-r--r-- | media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog index 7d0f41201204..9aebe02925a2 100644 --- a/media-libs/libquicktime/ChangeLog +++ b/media-libs/libquicktime/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libquicktime # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.123 2008/09/22 21:55:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.124 2008/09/26 13:20:00 aballier Exp $ + + 26 Sep 2008; Alexis Ballier <aballier@gentoo.org> + files/libquicktime-1.0.3-x264lavc.patch: + Fix the lavc patch again for bug #237234... why did I trust upstream in + merging the correct patch? 22 Sep 2008; Alexis Ballier <aballier@gentoo.org> files/libquicktime-1.0.3-x264lavc.patch: diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest index abfae7da9986..9d2b0db45416 100644 --- a/media-libs/libquicktime/Manifest +++ b/media-libs/libquicktime/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX libquicktime-1.0.3-x264lavc.patch 6949 RMD160 16de3254d977d0217a634e78bfffd51f2acc2365 SHA1 5d11971a8cf4daed67102399cdeffd5a61be2131 SHA256 4e18d9761df5316b8deaf0172f907d59b4b6d6310937b0bdbcc65f35754a6e7b +AUX libquicktime-1.0.3-x264lavc.patch 6939 RMD160 9ef1d7d5e3a47791c9939015f460b08d908f6d30 SHA1 d265c0ab4d04b7cea122d8f169650852a32fbc76 SHA256 77218bef978a3dd77ddf04f33a80d814d5a81fe55952fabbe94151280c02c997 DIST libquicktime-1.0.3.tar.gz 1003262 RMD160 470ea049318f54d4bb7d633b33bdfa7c296469b1 SHA1 3e5e59c2620e83c6e7257befe76edb4b136c787c SHA256 72aa1c21539cecf08ced57386541fd092dd5957677c77e4c7ddc4d7c30df769a EBUILD libquicktime-1.0.3.ebuild 2783 RMD160 19c6fc922bc329bcd4f51220f7acdaecfb1b5848 SHA1 475de84741f0a96d13f8156afd35ac025491f005 SHA256 a24c768f8d13614fd767dd03f3c472f83b810b908c10f0fc4e4ce05dc411fd83 -MISC ChangeLog 19153 RMD160 08a431a571ee3979e6e7d5e340753f80542b95bc SHA1 b36a443c6da60590718334f2e7f5a09802f127cd SHA256 f8f115f4e13c8dbe2f91c3f8a4c946d44cf4f2d599a555927741d42d9bc20894 +MISC ChangeLog 19352 RMD160 93b7848cd6712c269c7bea48adf61370ecb4184e SHA1 bfda9627f2bedb2f48eb9c4c58f552cddc21b685 SHA256 c341f754482a8f269a8ffbd83c66b0b0251839bc006e320f290fb8432b0bba54 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkjYFHAACgkQvFcC4BYPU0qS6ACfRDmk9ScgV3iXF89pKVcCtZLL -hMMAoLz3J2a2YcHCw1wc5Tiwo67hKb1G -=+IlM +iEYEARECAAYFAkjc4YYACgkQvFcC4BYPU0rn0gCcDi92qm+VsSU8P3gBd1LXI+al +CPAAoKQ4z8S/i9j6XzdEC8unz+Wn3eem +=HXhu -----END PGP SIGNATURE----- diff --git a/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch b/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch index aeb19ebea017..de44444f3bae 100644 --- a/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch +++ b/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch @@ -11,7 +11,7 @@ diff -u -B -r1.38 -r1.39 // priv->ctx->block_align = s->data.audio.block_align; // priv->ctx->bit_rate = s->codec_bitrate; - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 0, 0) ++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) codec->avctx->bits_per_sample = quicktime_audio_bits(file, track); - +#else @@ -108,7 +108,7 @@ diff -u -B -r1.63 -r1.64 codec->avctx->width = width; codec->avctx->height = height; + -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 0, 0) ++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) codec->avctx->bits_per_sample = quicktime_video_depth(file, track); +#else + codec->avctx->bits_per_coded_sample = quicktime_video_depth(file, track); |