[47772] trunk/dports/multimedia/ffmpeg

[devans at macports.org]

Revision: 47772
          http://trac.macports.org/changeset/47772
Author:   devans at macports.org
Date:     2009-03-05 15:54:53 -0800 (Thu, 05 Mar 2009)
Log Message:
-----------
ffmpeg: as per suggestion from simon, back-port patch from ffmpeg trunk to allow ffmpeg to build with libx264 support using current (version 66) api, update activate message.  Closes #18747.

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_libx264.c.diff

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2009-03-05 23:35:24 UTC (rev 47771)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2009-03-05 23:54:53 UTC (rev 47772)
@@ -5,7 +5,7 @@
 
 name		ffmpeg
 version		15261
-revision        4
+revision        5
 categories	multimedia
 maintainers	acho at macports.org openmaintainer
 description	Digital VCR and streaming server
@@ -37,6 +37,7 @@
 master_sites
 distfiles
 patchfiles      patch-libavcodec_ppc_check_altivec.c.diff \
+                patch-libavcodec_libx264.c.diff \
                 patch-libavfilter-avfilter.h.diff \
                 patch-libswscale-Makefile.diff \
                 patch-libswscale-swscale.h.diff
@@ -51,6 +52,7 @@
                 port:libvorbis \
                 port:libogg \
                 port:libtheora \
+                port:x264 \
                 port:dirac \
                 port:schroedinger \
                 port:faac \
@@ -101,6 +103,7 @@
                 --enable-libdirac --enable-libschroedinger \
                 --enable-libfaac \
                 --enable-libfaad \
+                --enable-libx264 \
                 --enable-libxvid \
                 --mandir=${prefix}/share/man \
                 --enable-shared --enable-pthreads \
@@ -171,7 +174,7 @@
 *******      swscale
 *******      liba52
 *******      libfaad
-*******      libx264 (disabled due to API changes in latest x264, use ffmpeg-devel)
+*******      libx264
 *******      libxvid
 *******
 ******* To include only LGPLed code use variants +no_gpl -a52

Added: trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_libx264.c.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_libx264.c.diff	                        (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libavcodec_libx264.c.diff	2009-03-05 23:54:53 UTC (rev 47772)
@@ -0,0 +1,29 @@
+--- libavcodec/libx264.c.orig	2009-03-05 22:54:53.000000000 +0100
++++ libavcodec/libx264.c	2009-03-05 22:56:14.000000000 +0100
+@@ -124,6 +124,8 @@
+ {
+     X264Context *x4 = avctx->priv_data;
+ 
++    av_freep(&avctx->extradata);
++
+     if(x4->enc)
+         x264_encoder_close(x4->enc);
+ 
+@@ -162,7 +164,7 @@
+ 
+     x4->params.i_bframe = avctx->max_b_frames;
+     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
+-    x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
++    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
+     x4->params.i_bframe_bias = avctx->bframebias;
+     x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
+     avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
+@@ -227,8 +229,6 @@
+     x4->params.analyse.i_me_range = avctx->me_range;
+     x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
+ 
+-    x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0;
+-    x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO;
+     x4->params.analyse.b_mixed_references =
+         avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
+     x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090305/c274ef81/attachment-0001.html>