diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-08 17:26:57 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-08 17:26:57 +0200 |
commit | 643800cee0ad5b853f06056ff90d24efa670f68c (patch) | |
tree | d873494ef64659d0cd0a836d2e2dd380d585e5c7 /package/ffmpeg/Makefile | |
parent | 3c70077f308437281c72431223b532f6f427e1d0 (diff) | |
parent | 081830a11721ddc097fd2272d4e7ebd47cb7f8dd (diff) |
Merge remote branch 'phil/auto-config-in'
Conflicts:
Config.in
package/dropbear/Makefile
package/iptables/Makefile
package/kismet/Makefile
package/nfs-utils/Makefile
package/ntpclient/Makefile
package/openvpn/Makefile
package/pkgmaker
package/rxvt-unicode/Makefile
package/vgp/Makefile
package/wpa_supplicant/Makefile
package/xf86-input-keyboard/Makefile
package/xf86-input-mouse/Makefile
Diffstat (limited to 'package/ffmpeg/Makefile')
-rw-r--r-- | package/ffmpeg/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 669c168ba..e9234fa68 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.6 PKG_RELEASE:= 1 PKG_MD5SUM:= d6142a9a5821d6a6262a6edb903faa24 PKG_DESCR:= solution to record, convert and stream audio and video -PKG_SECTION:= sound +PKG_SECTION:= multimedia PKG_DEPENDS:= libfaad2 PKG_BUILDDEP+= faad2 PKG_URL:= http://www.ffmpeg.org |