Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions package/ffmpeg/ffmpeg.hash
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Locally calculated
sha256 464beb5e7bf0c311e68b45ae2f04e9cc2af88851abb4082231742a74d97b524c ffmpeg-8.1.2.tar.xz
sha256 66aead94c3884c9bc1ff2866f44d87f2f61d106bf203e1c723f83170b7e84297 ffmpeg-6dbf87aefd7f491210abe1e043a1c228fa1439a0.tar.gz
sha256 c1755a73a4ac9a004bbdcb1cbf6b75308de7a9e918cdf8630d6e50ff25b4e0ed ffmpeg-3a4c4864e5790539ef00eeef8a229dbf19dc62e0.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2
sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1
sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md
12 changes: 3 additions & 9 deletions package/ffmpeg/ffmpeg.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,9 @@
# ffmpeg
#
################################################################################
# batocera - uses jc-kynesim's optimized branch for Amlogic
ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_AMLOGIC_ANY),y)
FFMPEG_VERSION = 3a4c4864e5790539ef00eeef8a229dbf19dc62e0
FFMPEG_SITE = $(call github,jc-kynesim,rpi-ffmpeg,$(FFMPEG_VERSION))
else
FFMPEG_VERSION = 8.1.2
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
FFMPEG_SITE = https://ffmpeg.org/releases
endif
FFMPEG_VERSION = 8.1.2
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
FFMPEG_SITE = https://ffmpeg.org/releases

FFMPEG_INSTALL_STAGING = YES

Expand Down