ffmpeg 2.1.3

Formula/ffmpeg.rb

@@ -2,21 +2,11 @@
 
 class Ffmpeg < Formula
   homepage 'http://ffmpeg.org/'
-  url 'http://ffmpeg.org/releases/ffmpeg-1.2.4.tar.bz2'
-  sha1 'ee73a05bde209fc23441c7e49767c1b7a4b6f124'
+  url 'http://ffmpeg.org/releases/ffmpeg-2.1.3.tar.bz2'
+  sha1 '9dc54bbef673f3938e280bf48d07e7b24fe445ab'
 
   head 'git://git.videolan.org/ffmpeg.git'
 
-  # This is actually the new stable, not a devel release,
-  # but not everything builds with it yet - notably gpac
-  devel do
-    url 'http://ffmpeg.org/releases/ffmpeg-2.1.3.tar.bz2'
-    sha1 '9dc54bbef673f3938e280bf48d07e7b24fe445ab'
-
-    depends_on 'libbluray' => :optional
-    depends_on 'libquvi' => :optional
-  end
-
   option "without-x264", "Disable H.264 encoder"
   option "without-lame", "Disable MP3 encoder"
   option "without-xvid", "Disable Xvid MPEG-4 video encoder"
@@ -58,15 +48,10 @@ class Ffmpeg < Formula
   depends_on 'opus' => :optional
   depends_on 'frei0r' => :optional
   depends_on 'libcaca' => :optional
-
-  # Fix build against freetype 2.5.1
-  # http://ffmpeg.org/pipermail/ffmpeg-devel/2013-November/151404.html
-  def patches; DATA; end if build.stable?
+  depends_on 'libbluray' => :optional
+  depends_on 'libquvi' => :optional
 
   def install
-    # Remove when fix for freetype 2.5.1+ is incorporated upstream
-    inreplace 'configure', 'ft2build.h freetype/freetype.h', 'ft2build.h freetype.h' if build.stable?
-
     args = ["--prefix=#{prefix}",
             "--enable-shared",
             "--enable-pthreads",
@@ -133,18 +118,3 @@ def install
   end
 
 end
-
-__END__
-diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
-index 2358e35..4c08092 100644
---- a/libavfilter/vf_drawtext.c
-+++ b/libavfilter/vf_drawtext.c
-@@ -48,7 +48,6 @@
- #include "video.h"
-
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #if CONFIG_FONTCONFIG
-