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/libmpeg2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libmpeg2') diff --git a/package/libmpeg2/Makefile b/package/libmpeg2/Makefile index aa54600a8..aa77c3af8 100644 --- a/package/libmpeg2/Makefile +++ b/package/libmpeg2/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libmpeg2 PKG_VERSION:= 0.5.1 PKG_RELEASE:= 3 PKG_MD5SUM:= 0f92c7454e58379b4a5a378485bbd8ef -PKG_DESCR:= MPEG-1 & -2 decoding library -PKG_SECTION:= libs +PKG_DESCR:= mpeg1 and mpeg2 decoding library +PKG_SECTION:= libs/video PKG_URL:= http://libmpeg2.sourceforge.net/ PKG_SITES:= http://libmpeg2.sourceforge.net/files/ PKG_OPTS:= dev -- cgit v1.2.3