[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Wed Dec 5 17:36:56 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 5 17:33:12 2012 +0100| [835fd779a46d14d6999618546a9833b3f2af2326] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=835fd779a46d14d6999618546a9833b3f2af2326
---
More information about the ffmpeg-cvslog
mailing list