Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Dec 2012 16:33:12 +0000 (17:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Dec 2012 16:33:12 +0000 (17:33 +0100)
commit835fd779a46d14d6999618546a9833b3f2af2326
tree5dc4b149f00fb880708bb2267fe004356a555072
parentfc1152de410323cf41dedd0bf301a6a265b0850f
parentda025d115a1ada58081cd869e85b81a1c183ae9e
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>
libavcodec/eamad.c
tests/fate-run.sh