* backport of [11370]

extras/contrib/src/Makefile

@@ -83,7 +83,7 @@ endif
 
 ifdef HAVE_DARWIN_OS
  all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
-	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .x264 .theora \
 	.FLAC .speex .faad .faac .lame .twolame .ebml .matroska .ffmpeg .openslp \
 	.dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
 	.png .gpg-error .gcrypt .gnutls .daap .cddb .cdio .vcdimager .aclocal
@@ -919,6 +919,25 @@ CLEAN_FILE += .dts
 CLEAN_PKG += libdts
 DISTCLEAN_PKG += libdts-$(LIBDTS_VERSION).tar.gz
 
+# ***************************************************************************
+# libdts
+# ***************************************************************************
+
+x264-$(X264_VERSION).tar.gz:
+	$(WGET) $(X264_URL)
+
+x264: x264-$(X264_VERSION).tar.gz
+	$(EXTRACT_GZ)
+
+
+.x264: x264
+	(cd $<; ./configure --enable-pthread --prefix=$(PREFIX) && make && make install)
+	touch $@
+
+CLEAN_FILE += .x264
+CLEAN_PKG += x264
+DISTCLEAN_PKG += x264-$(X264_VERSION).tar.gz
+
 # ***************************************************************************
 # libmodplug
 # ***************************************************************************

extras/contrib/src/packages.mak

@@ -126,3 +126,5 @@ MOZILLA_VERSION=1.7.5
 MOZILLA_URL=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$(MOZILLA_VERSION)/source/mozilla-source-$(MOZILLA_VERSION).tar.bz2
 TWOLAME_VERSION=0.3.2
 TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
+X264_VERSION=20050609
+X264_URL=$(VIDEOLAN)/testing/contrib/x264-$(X264_VERSION).tar.gz

modules/gui/macosx/output.m

@@ -131,7 +131,7 @@
     NSArray *o_v_scales = [NSArray arrayWithObjects: @"0.25",@"0.5",@"0.75",@"1",@"1.25",@"1.5",@"1.75",@"2",nil];
     NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"mp4a", @"a52 ", @"vorb", @"flac", @"spx ", nil];
     NSArray *o_v_codecs = [NSArray arrayWithObjects: @"mp1v", @"mp2v", @"mp4v", @"DIV1",
-        @"DIV2", @"DIV3", @"H263", @"I263", @"WMV1", @"WMV2", @"MJPG", @"theo", nil];
+        @"DIV2", @"DIV3", @"h263", @"h264", @"I263", @"WMV1", @"WMV2", @"MJPG", @"theo", nil];
 
     [o_output_ckbox setTitle: _NS("Advanced output:")];
     [o_output_settings setTitle: _NS("Settings...")];