# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1303580856 -7200
# Node ID cdcd17e66d70951c8f06d2216de2c27f5b24334e
# Parent  8569b674abd6a4ffa62356dc1414d2a5ee3a5640
upgrade package: ffmpeg

diff -r 8569b674abd6 -r cdcd17e66d70 src/ffmpeg.mk
--- a/src/ffmpeg.mk	Sat Apr 23 19:47:28 2011 +0200
+++ b/src/ffmpeg.mk	Sat Apr 23 19:47:36 2011 +0200
@@ -4,14 +4,14 @@
 # ffmpeg
 PKG             := ffmpeg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.6.2
-$(PKG)_CHECKSUM := d4e464d4111971b9cef10be7a1efa3677a899338
+$(PKG)_VERSION  := 0.6.90-rc0
+$(PKG)_CHECKSUM := a5c898a220a7f2220a49a37c44d273d1775d081c
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.ffmpeg.org/
 $(PKG)_URL      := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc bzip2 faad2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
+$(PKG)_DEPS     := gcc bzip2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://www.ffmpeg.org/download.html' | \
@@ -34,12 +34,13 @@
         --enable-version3 \
         --disable-nonfree \
         --enable-postproc \
+        --disable-pthreads \
+        --enable-w32threads \
         --enable-libspeex \
         --enable-libtheora \
         --enable-libvorbis \
         --enable-libmp3lame \
         --enable-libxvid \
-        --enable-libfaad \
         --disable-libfaac \
         --enable-libopencore-amrnb \
         --enable-libopencore-amrwb \
diff -r 8569b674abd6 -r cdcd17e66d70 src/openscenegraph-4-changeset-12154.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/openscenegraph-4-changeset-12154.patch	Sat Apr 23 19:47:36 2011 +0200
@@ -0,0 +1,16 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch has been taken from:
+http://www.openscenegraph.org/projects/osg/changeset/12154/
+
+Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
+===================================================================
+--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp (revision 10053)
++++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp (revision 12154)
+@@ -7,4 +7,5 @@
+ {
+ #define __STDC_CONSTANT_MACROS
++#define FF_API_OLD_SAMPLE_FMT 0
+ #include <errno.h>    // for error codes defined in avformat.h
+ #include <stdint.h>