Merge pull request #5902 from antonlacon/libvorbis

libvorbis: update to 1.3.6
This commit is contained in:
Ted Hess 2018-04-23 21:14:40 +00:00 committed by GitHub
commit aea4c43d2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 15 deletions

View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libvorbis
PKG_VERSION:=1.3.5
PKG_RELEASE:=2
PKG_VERSION:=1.3.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://downloads.xiph.org/releases/vorbis/
PKG_HASH:=54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1
PKG_HASH:=af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=BSD-3-Clause
@ -41,6 +41,12 @@ software entity may make full use of the format without license
fee, royalty or patent concerns.
endef
ifneq ($(findstring arm,$(CONFIG_ARCH)),)
TARGET_CFLAGS += -flto
TARGET_CXX_FLAGS += -flto
TARGET_LDFLAGS += -flto
endif
CONFIGURE_ARGS+= \
--disable-oggtest \

View File

@ -1,12 +0,0 @@
--- a/lib/info.c
+++ b/lib/info.c
@@ -583,7 +583,8 @@ int vorbis_analysis_headerout(vorbis_dsp
oggpack_buffer opb;
private_state *b=v->backend_state;
- if(!b||vi->channels<=0){
+ if(!b||vi->channels<=0||vi->channels>255){
+ b = NULL;
ret=OV_EFAULT;
goto err_out;
}