diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 21:22:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 21:23:13 +0200 |
| commit | 95b42188d6197c951738c491d3fddebf134d7755 (patch) | |
| tree | f579994010e532205fccb7367b5ee011c03ab919 /libavformat/nutdec.c | |
| parent | 63afe5b9140bacdf587cff0cd9427ab03fa76b72 (diff) | |
| parent | 21b21aed797b5e636adcf2df811f96a95f208930 (diff) | |
| download | ffmpeg-95b42188d6197c951738c491d3fddebf134d7755.tar.gz | |
Merge commit '21b21aed797b5e636adcf2df811f96a95f208930' into release/2.4
* commit '21b21aed797b5e636adcf2df811f96a95f208930':
nut: Check chapter creation in decode_info_header
Conflicts:
libavformat/nutdec.c
See: 3ff1af2b0db7132d5717be6395227a94c8abab07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutdec.c')
| -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 7ae722b74c..f8c3fecfb8 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -506,7 +506,7 @@ static int decode_info_header(NUTContext *nut) nut->time_base_count], start, start + chapter_len, NULL); 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); } metadata = &chapter->metadata; |