Commit 7e2a9a21 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

Contribs: use FFmpeg from git

parent 6d652d11
X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavformat%2Fape.c;h=187c9865a4fce398c7a4b4b19aad0a59b281a469;hp=2de47ef483245372a9a3c56656cd48a30a383856;hb=1c31b26bdf66879a46a7a3e340da815c1b2125a8;hpb=6947b0c42e0649f0c8355442d1732d642e467902
diff --git a/libavformat/ape.c b/libavformat/ape.c
index 2de47ef..187c986 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -242,6 +242,10 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
avio_seek(pb, ape->wavheaderlength, SEEK_CUR);
}
+ if(!ape->totalframes){
+ av_log(s, AV_LOG_ERROR, "No frames in the file!\n");
+ return AVERROR(EINVAL);
+ }
if(ape->totalframes > UINT_MAX / sizeof(APEFrame)){
av_log(s, AV_LOG_ERROR, "Too many frames: %d\n", ape->totalframes);
return -1;
# FFmpeg
FFMPEG_VERSION=0.4.8
FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
FFMPEG_SVN_REV=26400
FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=HEAD;sf=tgz
#FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=HEAD;sf=tgz
FFMPEGCONF = \
--cc="$(CC)" \
......@@ -105,29 +103,25 @@ ifeq ($(call need_pkg,"libavcodec libavformat libswscale"),)
PKGS_FOUND += ffmpeg
endif
ffmpeg-$(FFMPEG_VERSION).tar.gz:
$(error FFmpeg snapshot is too old, VCS must be used!)
$(call download,$(FFMPEG_URL))
$(TARBALLS)/ffmpeg-git.tar.gz:
$(call download,$(FFMPEG_SNAPURL))
$(TARBALLS)/ffmpeg-svn.tar.gz:
$(SVN) export $(FFMPEG_SVN) ffmpeg-svn
tar cvz ffmpeg-svn > $@
FFMPEG_VERSION := svn
FFMPEG_VERSION := git
.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(FFMPEG_VERSION).tar.gz
$(warning Not implemented.)
touch $@
ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
$(UNPACK)
rm -Rf ffmpeg-git
mkdir -p ffmpeg-git
zcat "$<" | (cd ffmpeg-git && tar xv --strip-components=1)
ifdef HAVE_WIN64
$(APPLY) $(SRC)/ffmpeg/ffmpeg-win64.patch
endif
ifdef HAVE_WIN32
sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure
endif
$(APPLY) $(SRC)/ffmpeg/libavformat-ape.c.patch
$(MOVE)
.ffmpeg: ffmpeg
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment