diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:59:52 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 02:00:29 +0200 |
commit | 3377f6fd15d7de5f574bf531c89b9670e52dc867 (patch) | |
tree | 62b14529d40d3480b6acf4e24c917525eea24911 /libavformat/utils.c | |
parent | 513673a84df5c5624686649136262c5aa14aba00 (diff) | |
parent | 8df5fbf0b0c0ba12b033e61c28fc240f4bccba47 (diff) | |
download | ffmpeg-3377f6fd15d7de5f574bf531c89b9670e52dc867.tar.gz |
Merge commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47'
* commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47':
lcl: Check memory allocation
Conflicts:
libavcodec/lclenc.c
See: 6dbcecd78e022493866fe39e30743284acc550b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions