diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 22:29:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 22:30:44 +0100 |
| commit | bd8788ea17c3fffdaf67756f580ab03688fff4c7 (patch) | |
| tree | d31741c7d52a321ef25fc26f54acfa892e5e1834 /libavutil/x86_cpu.h | |
| parent | e3c0fcaddabe91dfcfce4f606a576c79be1a6779 (diff) | |
| parent | 0d6605c7ef43f97a88950542af09078adef33b6d (diff) | |
| download | ffmpeg-bd8788ea17c3fffdaf67756f580ab03688fff4c7.tar.gz | |
Merge commit '0d6605c7ef43f97a88950542af09078adef33b6d'
* commit '0d6605c7ef43f97a88950542af09078adef33b6d':
mxf: Fix a possible leak of extradata
Conflicts:
libavformat/mxfdec.c
See: b65570808cb3b518f969f9288fe643bca6361b8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86_cpu.h')
0 files changed, 0 insertions, 0 deletions