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/ffmpeg/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'package/ffmpeg/Makefile') diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index e06a04c47..930b1f466 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.2.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 581affe5d820d89ce21fe3f0316ef2c3 PKG_DESCR:= record, convert and stream audio & video -PKG_SECTION:= libs +PKG_SECTION:= libs/video PKG_FDEPENDS:= libpthread PKG_URL:= http://www.ffmpeg.org/ PKG_SITES:= http://www.ffmpeg.org/releases/ @@ -16,21 +16,21 @@ PKH_LIBNAME:= libffmpeg PKG_OPTS:= dev PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG -#PKGSD_FFPLAY:= ffmpeg based video player -#PKGSC_FFPLAY:= multimedia +#PKGSD_FFPLAY:= video player +#PKGSC_FFPLAY:= mm/video #PKGSS_FFPLAY:= libsdl libpthread libffmpeg #PKGSB_FFPLAY:= sdl -PKGSD_FFMPEG:= ffmpeg video converter -PKGSC_FFMPEG:= multimedia +PKGSD_FFMPEG:= video converter +PKGSC_FFMPEG:= mm/video PKGSS_FFMPEG:= libffmpeg PKGSD_FFSERVER:= streaming server -PKGSC_FFSERVER:= multimedia +PKGSC_FFSERVER:= mm/video PKGSS_FFSERVER:= libffmpeg PKGSD_FFPROBE:= simple multimedia stream analyzer -PKGSC_FFPROBE:= multimedia +PKGSC_FFPROBE:= mm/video PKGSS_FFPROBE:= libffmpeg -PKGSD_LIBFFMPEG:= ffmpeg library -PKGSC_LIBFFMPEG:= libs +PKGSD_LIBFFMPEG:= video library +PKGSC_LIBFFMPEG:= libs/video PKG_FLAVOURS_LIBFFMPEG:= WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA PKG_FLAVOURS_LIBFFMPEG+= WITH_XVID WITH_VORBIS WITH_X264 -- cgit v1.2.3