summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-27 17:40:57 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-27 17:40:57 +0200
commitc1b80dcbbb34d63df65c0f52c0bede66dfa225e8 (patch)
tree2b929ffa6f2896bdee81729ceab2b9651c62055f /Makefile
parenta76f59b0390a408de0a666cb1edfc578b734596a (diff)
parent4f6c6ba61a1fc213c7356b9ae1b9467f177a67a5 (diff)
downloadmpv-c1b80dcbbb34d63df65c0f52c0bede66dfa225e8.tar.bz2
mpv-c1b80dcbbb34d63df65c0f52c0bede66dfa225e8.tar.xz
Merge svn changes up to r28204
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6ad523c2a5..2f0db04b35 100644
--- a/Makefile
+++ b/Makefile
@@ -728,7 +728,7 @@ DIRS = . \
ffmpeg/libavcodec/alpha \
ffmpeg/libavcodec/arm \
ffmpeg/libavcodec/bfin \
- ffmpeg/libavcodec/i386 \
+ ffmpeg/libavcodec/x86 \
ffmpeg/libavcodec/mlib \
ffmpeg/libavcodec/ppc \
ffmpeg/libavcodec/sh4 \