diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 12:33:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 12:33:39 +0200 |
| commit | ef4fcb30c4ec55aad8f3872534be06491f8db917 (patch) | |
| tree | 6494f351378372eada2bc111d8085166f36f187c /libavcodec/x86/h264_i386.h | |
| parent | 0bd15938ec5e0d5d77e217e7e3ce73c7c188ee5c (diff) | |
| parent | 3559fb97c459c88b4f1d0eef80d55933d3b7fabe (diff) | |
| download | ffmpeg-ef4fcb30c4ec55aad8f3872534be06491f8db917.tar.gz | |
Merge commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe'
* commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe':
movenc: Check that tracks->enc exists before trying to free extradata
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_i386.h')
0 files changed, 0 insertions, 0 deletions