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/libvpx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libvpx') diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index d30c35859..90744cca2 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libvpx PKG_VERSION:= 1.3.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 14783a148872f2d08629ff7c694eb31f -PKG_DESCR:= VP8/VP9 codec library -PKG_SECTION:= libs +PKG_DESCR:= vp8/vp9 codec library +PKG_SECTION:= libs/video PKG_URL:= http://www.webmproject.org/about/ PKG_SITES:= https://webm.googlecode.com/files/ PKG_OPTS:= dev -- cgit v1.2.3