generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  configure: Add support for Tilera processors
  wavdec: check size before reading the data, not after.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-17 15:53:42 +02:00
commit 775d41b617
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -1211,6 +1211,8 @@ ARCH_LIST='
sh4 sh4
sparc sparc
sparc64 sparc64
tilegx
tilepro
tomi tomi
x86 x86
x86_32 x86_32
@ -2796,6 +2798,9 @@ case "$arch" in
arch="sparc" arch="sparc"
subarch="sparc64" subarch="sparc64"
;; ;;
tilegx|tile-gx)
arch="tilegx"
;;
i[3-6]86|i86pc|BePC|x86pc|x86_64|x86_32|amd64) i[3-6]86|i86pc|BePC|x86pc|x86_64|x86_32|amd64)
arch="x86" arch="x86"
;; ;;

5
libavformat/wavdec.c
View File

@ -223,7 +223,7 @@ static int wav_read_header(AVFormatContext *s)
int64_t size, av_uninit(data_size); int64_t size, av_uninit(data_size);
int64_t sample_count=0; int64_t sample_count=0;
int rf64; int rf64;
uint32_t tag, list_type; uint32_t tag;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st = NULL; AVStream *st = NULL;
WAVDemuxContext *wav = s->priv_data; WAVDemuxContext *wav = s->priv_data;
@ -340,12 +340,11 @@ static int wav_read_header(AVFormatContext *s)
wav->smv_frames_per_jpeg = avio_rl24(pb); wav->smv_frames_per_jpeg = avio_rl24(pb);
goto break_loop; goto break_loop;
case MKTAG('L', 'I', 'S', 'T'): case MKTAG('L', 'I', 'S', 'T'):
list_type = avio_rl32(pb);
if (size < 4) { if (size < 4) {
av_log(s, AV_LOG_ERROR, "too short LIST tag\n"); av_log(s, AV_LOG_ERROR, "too short LIST tag\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
switch (list_type) { switch (avio_rl32(pb)) {
case MKTAG('I', 'N', 'F', 'O'): case MKTAG('I', 'N', 'F', 'O'):
if ((ret = ff_read_riff_info(s, size - 4)) < 0) if ((ret = ff_read_riff_info(s, size - 4)) < 0)
return ret; return ret;