diff options
| -rw-r--r-- | recipes/ffmpeg/ffmpeg.inc | 4 | ||||
| -rw-r--r-- | recipes/ffmpeg/ffmpeg_svn.bb | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index b6dfe53943..9cfdc19042 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://ffmpeg.mplayerhq.hu/" AUTHOR = "Fabrice Bellard ffmpeg-devel@mplayerhq.hu" SECTION = "libs" PRIORITY = "optional" -LICENSE = "LGPL" +LICENSE = "GPLv2+" ARM_INSTRUCTION_SET = "arm" @@ -12,7 +12,7 @@ PE = "2" DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS_${PN} = "mplayer" -INC_PR = "r16" +INC_PR = "r17" inherit autotools pkgconfig diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index 6f51a6010a..573de03b43 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -1,8 +1,5 @@ require ffmpeg.inc -# The license depends on the configure option selected in this recipe 'non-free' is disabled and 'gpl' is enabled -LICENSE = "GPLv2+" - DEPENDS += "virtual/libsdl schroedinger libgsm libvpx" # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes |