| Message ID | 1412526597-31347-2-git-send-email-0intro@gmail.com |
|---|---|
| State | Accepted |
| Commit | 3182056e98f698c3c7ed721cc76dc69aa9dcb008 |
| Headers | show |
>>>>> "David" == David du Colombier <0intro@gmail.com> writes: > Signed-off-by: David du Colombier <0intro@gmail.com> > --- > Changes v1 -> v4: > - s/FFMPEG_CONF_OPT/FFMPEG_CONF_OPTS/ Committed, thanks.
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 41b06a7..6b5711c 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -229,6 +229,13 @@ else FFMPEG_CONF_OPTS += --disable-libvpx endif +ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy) +FFMPEG_CONF_OPTS += --enable-libx264 +FFMPEG_DEPENDENCIES += x264 +else +FFMPEG_CONF_OPTS += --disable-libx264 +endif + ifeq ($(BR2_X86_CPU_HAS_MMX),y) FFMPEG_CONF_OPTS += --enable-yasm FFMPEG_DEPENDENCIES += host-yasm
Signed-off-by: David du Colombier <0intro@gmail.com> --- Changes v1 -> v4: - s/FFMPEG_CONF_OPT/FFMPEG_CONF_OPTS/ --- package/ffmpeg/ffmpeg.mk | 7 +++++++ 1 file changed, 7 insertions(+)