From a74fd5a1ec37e53fe7008f022639af6ede0e82c9 Mon Sep 17 00:00:00 2001
From: prigaux <pri@nopapers.org>
Date: Sun, 11 Feb 2007 20:00:15 +0000
Subject: Merge the 0.8.0_mpeg4ip branch into the trunk

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@285 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 macosx/ScanController.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'macosx/ScanController.h')

diff --git a/macosx/ScanController.h b/macosx/ScanController.h
index 47a7f6132..63c50b65c 100644
--- a/macosx/ScanController.h
+++ b/macosx/ScanController.h
@@ -1,4 +1,4 @@
-/* $Id: ScanController.h,v 1.4 2005/03/21 12:37:32 titer Exp $
+/*   $Id: ScanController.h,v 1.4 2005/03/21 12:37:32 titer Exp $
 
    This file is part of the HandBrake source code.
    Homepage: <http://handbrake.m0k.org/>.
@@ -6,7 +6,7 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include "hb.h"
+#include "mediafork.h"
 @class DriveDetector;
 @interface ScanController : NSObject
 {
-- 
cgit v1.2.3