diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-20 22:35:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-20 22:35:37 +0200 |
| commit | 5753d96771450ea4bf978164e8ba76fbdf9c55ee (patch) | |
| tree | 96bb0a0623e10e75a81887503baa120f58872b9d /libavformat | |
| parent | e162db66a224001776b959f67d7227dd9c083fb0 (diff) | |
| parent | 96bfb677478514db73d1b63b4213c97ad4269e8f (diff) | |
| download | ffmpeg-5753d96771450ea4bf978164e8ba76fbdf9c55ee.tar.gz | |
Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'
* commit '96bfb677478514db73d1b63b4213c97ad4269e8f':
nutdec: Prevent a memory corruption
Conflicts:
libavformat/nutdec.c
See: 05dd5368a92718f3a25f97f4697acffbabc7458f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/nutdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 1b00cdb954..0ecf2ec80d 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -484,7 +484,7 @@ static int decode_info_header(NUTContext *nut) int64_t value, end; char name[256], str_value[1024], type_str[256]; const char *type; - int *event_flags = NULL; + int *event_flags = NULL; AVChapter *chapter = NULL; AVStream *st = NULL; AVDictionary **metadata = NULL; |