mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'
* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
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:
commit
8b0ceb96da
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue