RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-03 05:22:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  fate: workaround for slighly broken 'test' shell builtin
  mimic: initialize padding of swap_buf through av_fast_padded_malloc
  eamad: initialize padding of bitstream_buf through av_fast_padded_malloc()
  raw demuxer: initialize end of partial packets

Conflicts:
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-05 17:33:12 +01:00
commit 835fd779a4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/eamad.c
View File

@ -276,7 +276,8 @@ static int decode_frame(AVCodecContext *avctx,
} }
} }
av_fast_malloc(&s->bitstream_buf, &s->bitstream_buf_size, (buf_end-buf) + FF_INPUT_BUFFER_PADDING_SIZE); av_fast_padded_malloc(&s->bitstream_buf, &s->bitstream_buf_size,
buf_end - buf);
if (!s->bitstream_buf) if (!s->bitstream_buf)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->dsp.bswap16_buf(s->bitstream_buf, (const uint16_t*)buf, (buf_end-buf)/2); s->dsp.bswap16_buf(s->bitstream_buf, (const uint16_t*)buf, (buf_end-buf)/2);

2
tests/fate-run.sh
View File

@ -78,7 +78,7 @@ ffmpeg(){
dec_opts="-threads $threads -thread_type $thread_type" dec_opts="-threads $threads -thread_type $thread_type"
ffmpeg_args="-nostats -cpuflags $cpuflags" ffmpeg_args="-nostats -cpuflags $cpuflags"
for arg in $@; do for arg in $@; do
[ ${arg} = -i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}" [ x${arg} = x-i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}"
ffmpeg_args="${ffmpeg_args} ${arg}" ffmpeg_args="${ffmpeg_args} ${arg}"
done done
run ffmpeg ${ffmpeg_args} run ffmpeg ${ffmpeg_args}