diff options
| author | Michael Niedermayer <[email protected]> | 2015-06-01 02:23:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-06-01 02:23:32 +0200 |
| commit | 615e73ab4f8cd85e490c7d141fd710385bfaa8ac (patch) | |
| tree | f8e3627021219f0026059e91e84e6d2b9808f185 /libavcodec/pthread_frame.c | |
| parent | 1a903f0d1e989bc6fba98fdcbf8e222b5b8cfc6c (diff) | |
| parent | 03927cb73399e6f07185fc7f8851d7612b4187b6 (diff) | |
Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'
* commit '03927cb73399e6f07185fc7f8851d7612b4187b6':
psymodel: Check memory allocation
Conflicts:
libavcodec/psymodel.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/pthread_frame.c')
0 files changed, 0 insertions, 0 deletions