diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-05 21:39:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-05 21:41:01 +0100 |
| commit | 7a64f1684178169e38865b38b146f737142f0ba2 (patch) | |
| tree | 941dbf4830d6ac3fd85d5761a01049ed31e3b1b4 /cmdutils.c | |
| parent | 4ba01419215c335e68e6b4fe448f416283bb55ff (diff) | |
| parent | 56de2897a68e3a8795b0b3c593dad1c5832696e0 (diff) | |
| download | ffmpeg-7a64f1684178169e38865b38b146f737142f0ba2.tar.gz | |
Merge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0'
* commit '56de2897a68e3a8795b0b3c593dad1c5832696e0':
h264: Fix memory leak on ff_h264_decode_init() failure
Conflicts:
libavcodec/h264.c
See: 309a931a38b42c0a635f096cdbea9c21c5e54eab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions