| 1 |
aballier 08/09/26 13:20:01 |
| 2 |
|
| 3 |
Modified: libquicktime-1.0.3-x264lavc.patch |
| 4 |
Log: |
| 5 |
Fix the lavc patch again for bug #237234... why did I trust upstream in merging the correct patch? |
| 6 |
(Portage version: 2.2_rc10/cvs/Linux 2.6.26.5 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: libquicktime-1.0.3-x264lavc.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libquicktime/files/libquicktime-1.0.3-x264lavc.patch,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- libquicktime-1.0.3-x264lavc.patch 22 Sep 2008 21:55:55 -0000 1.2 |
| 22 |
+++ libquicktime-1.0.3-x264lavc.patch 26 Sep 2008 13:20:01 -0000 1.3 |
| 23 |
@@ -11,7 +11,7 @@ |
| 24 |
// priv->ctx->block_align = s->data.audio.block_align; |
| 25 |
// priv->ctx->bit_rate = s->codec_bitrate; |
| 26 |
- |
| 27 |
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 0, 0) |
| 28 |
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) |
| 29 |
codec->avctx->bits_per_sample = quicktime_audio_bits(file, track); |
| 30 |
- |
| 31 |
+#else |
| 32 |
@@ -108,7 +108,7 @@ |
| 33 |
codec->avctx->width = width; |
| 34 |
codec->avctx->height = height; |
| 35 |
+ |
| 36 |
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 0, 0) |
| 37 |
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) |
| 38 |
codec->avctx->bits_per_sample = quicktime_video_depth(file, track); |
| 39 |
+#else |
| 40 |
+ codec->avctx->bits_per_coded_sample = quicktime_video_depth(file, track); |
Archives