From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/libx264/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libx264') 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 -- cgit v1.2.3