From 8085371f8ee41700d9e628716f365f3eeb06bb23 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Fri, 4 May 2007 01:46:11 +0200
Subject: [PATCH] reenable building internal ffmpeg

---
 configure.ac          | 4 ++--
 quicktime/Makefile.am | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index fcb85514..12aca356 100644
--- a/configure.ac
+++ b/configure.ac
@@ -336,9 +336,9 @@ if test "x$with_external_ffmpeg" = "xyes"; then
      FFMPEG_FOLDER=""
      FFMPEG_EXTERNALTEXT="External ffmpeg"
 else
-     FFMPEG_FOLDER=ffmpeg
+     FFMPEG_FOLDER=quicktime/ffmpeg
      FFMPEG_CFLAGS="-I\$(top_srcdir)/quicktime/ffmpeg/libavcodec"
-     FFMPEG_LIBS="ffmpeg/libavcodec/libavcodec.la"
+     FFMPEG_LIBS="quicktime/ffmpeg/libavcodec/libavcodec.la"
      FFMPEG_EXTERNALTEXT="Internal ffmpeg"
 fi
 
diff --git a/quicktime/Makefile.am b/quicktime/Makefile.am
index a960cbb7..912f93f7 100644
--- a/quicktime/Makefile.am
+++ b/quicktime/Makefile.am
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/quicktime/encore50/Makefile.am
 
-# SUBDIRS += @FFMPEG_FOLDER@
+SUBDIRS += @FFMPEG_FOLDER@
 
 lib_LTLIBRARIES += libquicktimehv.la
 libquicktimehv_la_srcdir = $(top_srcdir)/quicktime
-- 
2.11.4.GIT