diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 17:33:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 17:33:12 +0100 |
| commit | 835fd779a46d14d6999618546a9833b3f2af2326 (patch) | |
| tree | 5dc4b149f00fb880708bb2267fe004356a555072 /libavcodec/escape130.c | |
| parent | fc1152de410323cf41dedd0bf301a6a265b0850f (diff) | |
| parent | da025d115a1ada58081cd869e85b81a1c183ae9e (diff) | |
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>
Diffstat (limited to 'libavcodec/escape130.c')
0 files changed, 0 insertions, 0 deletions