diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-22 03:51:49 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-22 03:51:49 +0100 |
commit | a821617b5a09321a4ff875f77ad95daf6942c0d1 (patch) | |
tree | 5bfa8eecc4497bb66a5255da219c56bbd615e5b0 /libavcodec/mss34dsp.c | |
parent | a3f5a8c3e06f330f7c572e454dad5dae85515ac7 (diff) | |
parent | d450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7 (diff) | |
download | ffmpeg-a821617b5a09321a4ff875f77ad95daf6942c0d1.tar.gz |
Merge commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7'
* commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7':
avplay: Check memory allocation
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mss34dsp.c')
0 files changed, 0 insertions, 0 deletions