3 files changed, 24 insertions, 12 deletions
diff --git a/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c b/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c
new file mode 100644
index 000000000000..62f52c8206fe
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c
@@ -0,0 +1,11 @@
+--- libavcodec/libgsm.c.orig	2010-07-21 10:24:16.297810379 +0200
++++ libavcodec/libgsm.c	2010-07-21 10:24:22.915234561 +0200
+@@ -28,7 +28,7 @@
+ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
+ 
+ #include "avcodec.h"
+-#include <gsm/gsm.h>
++#include <gsm.h>
+ 
+ // gsm.h misses some essential constants
+ #define GSM_BLOCK_SIZE 33
diff --git a/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c b/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c
deleted file mode 100644
index 5c5e61694f70..000000000000
--- a/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavformat/sierravmd.c
-+++ libavformat/sierravmd.c
-@@ -154,7 +154,7 @@ static int vmd_read_header(AVFormatContext *s,
-     vmd->frame_table = NULL;
-     sound_buffers = AV_RL16(&vmd->vmd_header[808]);
-     raw_frame_table_size = vmd->frame_count * 6;
--    if(vmd->frame_count * vmd->frames_per_block  >= UINT_MAX / sizeof(vmd_frame)){
-+    if(vmd->frame_count * vmd->frames_per_block  >= (UINT_MAX - sound_buffers) / sizeof(vmd_frame)){
-         av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n");
-         return -1;
-     }
-
diff --git a/multimedia/ffmpeg/files/patch-libavutil-common.h b/multimedia/ffmpeg/files/patch-libavutil-common.h
new file mode 100644
index 000000000000..9bb629bc0ab8
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavutil-common.h
@@ -0,0 +1,13 @@
+--- libavutil/common.h.orig	2010-04-26 23:01:38.000000000 +0200
++++ libavutil/common.h	2010-07-10 16:06:27.038027901 +0200
+@@ -36,6 +36,10 @@
+ #include <string.h>
+ #include "attributes.h"
+ 
++#ifndef	UINT64_C
++#define	UINT64_C(c)		(c ## UL)
++#endif
++
+ //rounded division & shift
+ #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
+ /* assume b>0 */