diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/vlc | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/vlc')
| -rw-r--r-- | package/vlc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/vlc/Makefile b/package/vlc/Makefile index a33a1efb1..b1934aedf 100644 --- a/package/vlc/Makefile +++ b/package/vlc/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 7ed67d22f7425011078772bfc62ac222 PKG_DESCR:= popular media player -PKG_SECTION:= multimedia +PKG_SECTION:= mm/video PKG_BUILDDEP:= ffmpeg xcb-util libtheora libgcrypt libmad PKG_DEPENDS:= libffmpeg xcb-util libtheora libgcrypt PKG_URL:= http://www.videolan.org/vlc/ |