diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 22:10:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 22:10:40 +0100 |
| commit | fff5f6554006ee273f0564134e9463554701d971 (patch) | |
| tree | 12d19b992e8fd6e31297a93cbe051e62adc9a519 /libavformat/mpjpeg.c | |
| parent | 7cb24ecd4c41d3e31dd5d5f56e0f5bfa081ac5a7 (diff) | |
| parent | c095137d1b02ba6812ca9a035fa53e8a3ff7dfec (diff) | |
| download | ffmpeg-fff5f6554006ee273f0564134e9463554701d971.tar.gz | |
Merge remote-tracking branch 'jamrial/release/0.11' into release/0.11
* jamrial/release/0.11:
lavc/bink: Chech for malloc failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpjpeg.c')
0 files changed, 0 insertions, 0 deletions