diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-04-07 16:53:23 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-04-07 16:53:23 +0000 |
| commit | da08f5e326f84acef525da6b4f8004b2c3650515 (patch) | |
| tree | cf86c8134895c49f29753864d58eeb3509f4fcbf /gst-libs/ext/ffmpeg | |
| parent | 6ca2db8f5fc44aac0fe0fa5b0fd87ae1a61aa031 (diff) | |
| download | gst-plugins-bad-da08f5e326f84acef525da6b4f8004b2c3650515.tar.gz gst-plugins-bad-da08f5e326f84acef525da6b4f8004b2c3650515.tar.bz2 gst-plugins-bad-da08f5e326f84acef525da6b4f8004b2c3650515.zip | |
Fixes #110009
Original commit message from CVS:
Fixes #110009
Diffstat (limited to 'gst-libs/ext/ffmpeg')
| -rw-r--r-- | gst-libs/ext/ffmpeg/patch/function.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/gst-libs/ext/ffmpeg/patch/function.patch b/gst-libs/ext/ffmpeg/patch/function.patch index 203fafb4..4ee5b6dc 100644 --- a/gst-libs/ext/ffmpeg/patch/function.patch +++ b/gst-libs/ext/ffmpeg/patch/function.patch @@ -63,3 +63,25 @@ diff -urN ffmpeg.patch/libavformat/wav.c ffmpeg/libavformat/wav.c av_register_input_format(&wav_iformat); av_register_output_format(&wav_oformat); } +--- 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> + #include <fcntl.h> |