diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 12:47:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 12:47:04 +0200 |
| commit | da2038221bc68e28edaaeddecff8d48cce2c9e52 (patch) | |
| tree | 6a8ff920c6cef98e0468576246aeeb6edae2cb36 /library.mak | |
| parent | ef4fcb30c4ec55aad8f3872534be06491f8db917 (diff) | |
| parent | 2bbad1f94cbc5eab0aa2d937bc79d085477d0242 (diff) | |
| download | ffmpeg-da2038221bc68e28edaaeddecff8d48cce2c9e52.tar.gz | |
Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'
* commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242':
movenc: Properly free allocated data on failures in mov_write_header
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
0 files changed, 0 insertions, 0 deletions