summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gst-libs/ext/ffmpeg/patch/function.patch18
1 files changed, 15 insertions, 3 deletions
diff --git a/gst-libs/ext/ffmpeg/patch/function.patch b/gst-libs/ext/ffmpeg/patch/function.patch
index 53970dc8..4ee5b6dc 100644
--- a/gst-libs/ext/ffmpeg/patch/function.patch
+++ b/gst-libs/ext/ffmpeg/patch/function.patch
@@ -63,12 +63,24 @@ diff -urN ffmpeg.patch/libavformat/wav.c ffmpeg/libavformat/wav.c
av_register_input_format(&wav_iformat);
av_register_output_format(&wav_oformat);
}
---- ffmpeg.patch/libavformat/grab.c Fri Apr 4 23:14:14 2003
-+++ ffmpeg/libavformat/grab.c Fri Apr 4 23:14:27 2003
-@@ -17,6 +17,7 @@
+--- ffmpeg/libavformat/grab.c- Fri Apr 4 23:14:14 2003
++++ ffmpeg/libavformat/grab.c Sat Apr 5 23:15:38 2003
+@@ -17,6 +17,19 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "avformat.h"
++/* Because of some really cool feature in video4linux1, also known as
++ * 'not including sys/types.h and sys/time.h', we had to include it
++ * ourselves. In all their intelligence, these people decided to fix
++ * this in the next version (video4linux2) in such a cool way that it
++ * breaks all compilations of old stuff...
++ * The real problem is actually that linux/time.h doesn't use proper
++ * macro checks before defining types like struct timeval. The proper
++ * fix here is to either fuck the kernel header (which is what we do
++ * by defining _LINUX_TIME_H, an innocent little hack) or by fixing it
++ * upstream, which I'll consider doing later on. If you get compiler
++ * errors here, check your linux/time.h && sys/time.h header setup.
++ */
+#define _LINUX_TIME_H
#include <linux/videodev.h>
#include <unistd.h>