diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-07-17 00:06:49 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-07-17 00:06:49 +0000 |
| commit | e5a07e89eee07991812965e5de9855524326046d (patch) | |
| tree | af0292e04acbd90cec81e21a5c10b76731ed7bba /packages/gstreamer/gst-ffmpeg-0.10.4 | |
| parent | af568c07872e91924a320060b9b651ad23efc67c (diff) | |
| parent | ce10c417ad24f7d9d1db3e63a076d56ac9143252 (diff) | |
merge of '4c6f4640a8b948badde77deaaebbfc2c9959ecae'
and 'e5e5a9814f67f07864e0b56012257f49ace89669'
Diffstat (limited to 'packages/gstreamer/gst-ffmpeg-0.10.4')
| -rw-r--r-- | packages/gstreamer/gst-ffmpeg-0.10.4/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gstreamer/gst-ffmpeg-0.10.4/configure-hack.diff | 10 |
2 files changed, 10 insertions, 0 deletions
diff --git a/packages/gstreamer/gst-ffmpeg-0.10.4/.mtn2git_empty b/packages/gstreamer/gst-ffmpeg-0.10.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gstreamer/gst-ffmpeg-0.10.4/.mtn2git_empty diff --git a/packages/gstreamer/gst-ffmpeg-0.10.4/configure-hack.diff b/packages/gstreamer/gst-ffmpeg-0.10.4/configure-hack.diff new file mode 100644 index 0000000000..0c3b5b162f --- /dev/null +++ b/packages/gstreamer/gst-ffmpeg-0.10.4/configure-hack.diff @@ -0,0 +1,10 @@ +--- /tmp/configure.ac 2008-07-03 19:47:44.000000000 +0200 ++++ gst-ffmpeg-0.10.4/configure.ac 2008-07-03 19:47:57.000000000 +0200 +@@ -294,7 +294,6 @@ + AC_SUBST(FFMPEG_CO_DIR) + AC_SUBST(FFMPEG_SVN) + AC_SUBST(FFMPEG_REVISION) +- AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg) + AC_MSG_NOTICE([Using included FFMpeg code]) + fi + |