diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 11:30:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 11:30:17 +0200 |
| commit | 8895b71d6fc107c51b1bbc32323da5b2a617e842 (patch) | |
| tree | f39ec0546c2a7ca599f6dbe6449ccf31f43dd591 | |
| parent | 3a8b52c0113be1b0e74246adca71834f1d0734b2 (diff) | |
| parent | 29c455ce3daf7fb369ba20cf77c74bd8e3b43b55 (diff) | |
| download | ffmpeg-8895b71d6fc107c51b1bbc32323da5b2a617e842.tar.gz | |
Merge commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55'
* commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55':
bitstream: Check the result of av_malloc()
Conflicts:
libavcodec/bitstream.c
See: aa74810fc6b9afe21c9be3725e3d078d10633670
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions