diff options
| author | Michael Niedermayer <[email protected]> | 2015-06-01 02:26:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-06-01 02:27:26 +0200 |
| commit | abee1972ef8a88fde0bff5f40f4767cb3150d26e (patch) | |
| tree | d687cb497295227bc6c86abc0c879ee97f0d9fac /libavformat | |
| parent | 6ed8341cb163e4c253449458aa21a0b3aab1e2b6 (diff) | |
| parent | 42df71d9bbb1a5b4bce0bb34417692565c72d390 (diff) | |
Merge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390'
* commit '42df71d9bbb1a5b4bce0bb34417692565c72d390':
ratecontrol: Check memory allocation
Conflicts:
libavcodec/ratecontrol.c
See: 0898a6d4e4b669704fce663f610aa43dd7483fe9
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions