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/libx264 | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/libx264')
| -rw-r--r-- | package/libx264/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/libx264/Makefile b/package/libx264/Makefile index 20e2e5f17..5208ffde6 100644 --- a/package/libx264/Makefile +++ b/package/libx264/Makefile @@ -8,8 +8,8 @@ PKG_NAME:= libx264 PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 43946c39a27327f25751cddc1db0ed77 -PKG_DESCR:= H264 encoding library -PKG_SECTION:= libs +PKG_DESCR:= h264 encoding library +PKG_SECTION:= libs/video PKG_URL:= http://www.videolan.org/developers/x264.html PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev |