1. ffmpeg
  2. Commit 835fd779a46d14d6999618546a9833b3f2af2326
Browse code

Merge remote-tracking branch 'qatar/master'

* 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>

Michael Niedermayer authored on 2012/12/06 01:33:12
Showing 2 changed files
libavcodec/eamad.c
History View file @ 835fd77
... ... 
@@ -276,7 +276,8 @@ static int decode_frame(AVCodecContext *avctx,
276 276 
         }
277 277 
     }
278 278
279 
-    av_fast_malloc(&s->bitstream_buf, &s->bitstream_buf_size, (buf_end-buf) + FF_INPUT_BUFFER_PADDING_SIZE);
279 
+    av_fast_padded_malloc(&s->bitstream_buf, &s->bitstream_buf_size,
280 
+                          buf_end - buf);
280 281 
     if (!s->bitstream_buf)
281 282 
         return AVERROR(ENOMEM);
282 283 
     s->dsp.bswap16_buf(s->bitstream_buf, (const uint16_t*)buf, (buf_end-buf)/2);
tests/fate-run.sh
History View file @ 835fd77
... ... 
@@ -78,7 +78,7 @@ ffmpeg(){
78 78 
     dec_opts="-threads $threads -thread_type $thread_type"
79 79 
     ffmpeg_args="-nostats -cpuflags $cpuflags"
80 80 
     for arg in $@; do
81 
-        [ ${arg} = -i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}"
81 
+        [ x${arg} = x-i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}"
82 82 
         ffmpeg_args="${ffmpeg_args} ${arg}"
83 83 
     done
84 84 
     run ffmpeg ${ffmpeg_args}