diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 02:41:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 02:42:29 +0200 |
| commit | 07f606b4f0149b6515248b9f7b879a59b2008d7e (patch) | |
| tree | cfa26a6e4ec3d76bf92723e6941893b741f74f96 /libavformat/utils.c | |
| parent | f24b7d7616533cd00475d7bf93f3a33ff5ac40dc (diff) | |
| parent | e1ea365f7e1477c78865b866a180712174536c20 (diff) | |
| download | ffmpeg-07f606b4f0149b6515248b9f7b879a59b2008d7e.tar.gz | |
Merge commit 'e1ea365f7e1477c78865b866a180712174536c20'
* commit 'e1ea365f7e1477c78865b866a180712174536c20':
truemotion2: Check memory allocation
Conflicts:
libavcodec/truemotion2.c
See: d49f2603bedb780a6cedff4ac790605679cf4029
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions