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/mplayer | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/mplayer')
| -rw-r--r-- | package/mplayer/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 51ecceea4..38a702a99 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.1 PKG_RELEASE:= 3 PKG_MD5SUM:= 39dd55f30eb5403f219a606e79a6648a PKG_DESCR:= popular video player -PKG_SECTION:= multimedia +PKG_SECTION:= mm/video PKG_DEPENDS:= alsa-lib libjpeg-turbo libfaad2 libmad libncurses PKG_DEPENDS+= libogg libpng libpthread libvorbis giflib PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib |