generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '21b21aed797b5e636adcf2df811f96a95f208930' into release/2.4

Browse Source 
* commit '21b21aed797b5e636adcf2df811f96a95f208930':
  nut: Check chapter creation in decode_info_header

Conflicts:
	libavformat/nutdec.c

See: 3ff1af2b0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-19 21:22:59 +02:00
parent 63afe5b914 21b21aed79
commit 95b42188d6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/nutdec.c
View File

@@ -506,7 +506,7 @@ static int decode_info_header(NUTContext *nut)
nut->time_base_count], nut->time_base_count],
start, start + chapter_len, NULL); start, start + chapter_len, NULL);
if (!chapter) { if (!chapter) {
av_log(s, AV_LOG_ERROR, "could not create chapter\n"); av_log(s, AV_LOG_ERROR, "Could not create chapter.\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
metadata = &chapter->metadata; metadata = &chapter->metadata;