From cinelerra-commits-admin@skolelinux.no  Sun Nov 25 15:26:40 2007
Return-Path: <cinelerra-commits-admin@skolelinux.no>
X-Original-To: cinelerra-commits@e.kevb.net
Delivered-To: cinelerra-commits@e.kevb.net
Received: from init.linpro.no (init.linpro.no [80.232.38.252])
	by e.kevb.net (Postfix) with ESMTP id C234CEC8A0F
	for <cinelerra-commits@e.kevb.net>; Sun, 25 Nov 2007 15:26:38 -0500 (EST)
Received: from localhost ([127.0.0.1] helo=init.linpro.no)
	by init.linpro.no with esmtp (Exim 4.50 #1 (Debian))
	id 1IwO3h-00006x-8q; Sun, 25 Nov 2007 21:26:34 +0100
Received: from [193.69.32.11] (helo=virusvask01.itsjefen.no)
	by init.linpro.no with esmtp (Exim 4.50 #1 (Debian))
	id 1IwO1b-0008MK-Nk
	for <cinelerra-commits@skolelinux.no>; Sun, 25 Nov 2007 21:24:23 +0100
Received: from [193.69.32.11] by 80.232.38.252 (e-nough); Sun, 25 Nov 21:24:13 2007 +0100
Received: from localhost (localhost.localdomain [127.0.0.1])
	by virusvask01.itsjefen.no (Postfix) with ESMTP id BADC38AC023
	for <cinelerra-commits@skolelinux.no>; Sun, 25 Nov 2007 21:24:20 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at virusvask01.itsjefen.no
Received: from virusvask01.itsjefen.no ([127.0.0.1])
	by localhost (virusvask01.itsjefen.no [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id hTrXU0s74CZS for <cinelerra-commits@skolelinux.no>;
	Sun, 25 Nov 2007 21:24:16 +0100 (CET)
Received: from mail-forward.uio.no (mail-forward.uio.no [129.240.10.42])
	by virusvask01.itsjefen.no (Postfix) with ESMTP id C42008AC010
	for <cinelerra-commits@skolelinux.no>; Sun, 25 Nov 2007 21:24:12 +0100 (CET)
Received: from mail-mx6.uio.no ([129.240.10.47])
	by pat.uio.no with esmtp (Exim 4.67)
	(envelope-from <j6t@user.skolelinux.no>)
	id 1IwO1L-0003bj-Ru
	for cinelerra-commits@skolelinux.no; Sun, 25 Nov 2007 21:24:03 +0100
Received: from user.skolelinux.no ([158.36.191.139])
	by mail-mx6.uio.no with esmtps (TLSv1:AES256-SHA:256)
	(Exim 4.67)
	(envelope-from <j6t@user.skolelinux.no>)
	id 1IwO1L-0004LB-Ex
	for cinelerra-commits@skolelinux.no; Sun, 25 Nov 2007 21:24:03 +0100
Received: from j6t by user.skolelinux.no with local (Exim 4.63)
	(envelope-from <j6t@user.skolelinux.no>)
	id 1IwO1L-0004xT-5e
	for cinelerra-commits@skolelinux.no; Sun, 25 Nov 2007 21:24:03 +0100
To: cinelerra-commits@skolelinux.no
Content-Type: text/plain; charset=UTF-8
From: "Johannes Sixt <johannes.sixt@telecom.at>" <j6t@user.skolelinux.no>
Message-Id: <E1IwO1L-0004xT-5e@user.skolelinux.no>
X-UiO-ClamAV-Virus: No
X-UiO-Spam-info: not spam, SpamAssassin (score=0.0, required=12.0, autolearn=disabled, none)
X-UiO-Scanned: FD3E087EE6E4A29A09CCDF62E607B475CBDB6906
X-UiO-SPAM-Test: remote_host: 158.36.191.139 spam_score: 0 maxlevel 200 minaction 2 bait 0 mail/h: 1 total 15536 max/h 1028 blacklist 0 greylist 0 ratelimit 0
Content-Transfer-Encoding: quoted-printable
X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on spamtrap
X-Spam-Status: No, hits=-10.2 required=5.0 tests=DSPAM=-10.19694  version=2.63
X-Spam-Level: 
X-DSPAM-Signature: !DSPAM:4749d9ef264441028018420!
X-DSPAM-Probability: -2.0000
X-DSPAM-Confidence: 0.9997
X-Spam-Score: 0.0 (/)
Subject: [Cinelerra-commits] r1040 - trunk/hvirtual/cinelerra
Sender: cinelerra-commits-admin@skolelinux.no
Errors-To: cinelerra-commits-admin@skolelinux.no
X-BeenThere: cinelerra-commits@skolelinux.no
X-Mailman-Version: 2.0.13
Precedence: bulk
List-Unsubscribe: <https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra-commits>,
	<mailto:cinelerra-commits-request@skolelinux.no?subject=unsubscribe>
List-Id: Commits to the Cinelerra CVS. <cinelerra-commits.skolelinux.no>
List-Post: <mailto:cinelerra-commits@skolelinux.no>
List-Help: <mailto:cinelerra-commits-request@skolelinux.no?subject=help>
List-Subscribe: <https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra-commits>,
	<mailto:cinelerra-commits-request@skolelinux.no?subject=subscribe>
List-Archive: <https://init.linpro.no/pipermail/skolelinux.no/cinelerra-commits/>
Date: Sun, 25 Nov 2007 21:24:03 +0100
X-Spam-Score: 0.0 (/)

Author: j6t
Date: 2007-11-25 21:24:02 +0100 (Sun, 25 Nov 2007)
New Revision: 1040

Modified:
   trunk/hvirtual/cinelerra/ffmpeg.h
   trunk/hvirtual/cinelerra/fileac3.h
Log:
Fix for newer ffmpeg: needs extern "C" brackets.

Patch by Nicolas (kwizart).


Modified: trunk/hvirtual/cinelerra/ffmpeg.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hvirtual/cinelerra/ffmpeg.h	2007-11-25 19:54:05 UTC (rev 1039)
+++ trunk/hvirtual/cinelerra/ffmpeg.h	2007-11-25 20:24:02 UTC (rev 1040)
@@ -1,7 +1,9 @@
 #ifndef FFMPEG_H
 #define FFMPEG_H
=20
+extern "C" {
 #include <avcodec.h>
+};
=20
 #include "asset.h"
 #include "guicast.h"

Modified: trunk/hvirtual/cinelerra/fileac3.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hvirtual/cinelerra/fileac3.h	2007-11-25 19:54:05 UTC (rev 1039)
+++ trunk/hvirtual/cinelerra/fileac3.h	2007-11-25 20:24:02 UTC (rev 1040)
@@ -1,8 +1,10 @@
 #ifndef FILEAC3_H
 #define FILEAC3_H
=20
+extern "C" {
+#include <avcodec.h>
+};
=20
-#include <avcodec.h>
 #include "filebase.h"
 #include <stdio.h>
=20


_______________________________________________
Cinelerra-commits mailing list
Cinelerra-commits@skolelinux.no
https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra-commits
