diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-29 16:17:36 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-29 16:17:36 +0100 |
| commit | 2ee89553aafee6b8f8df0e7f602ac331ceeded3e (patch) | |
| tree | ab2c93b149d7112dd17a7123f63a9f263dfda6da /libavformat/nutdec.c | |
| parent | 2e4d10ae553a867a222d4e4e0a0dfd1dc1b70b97 (diff) | |
| parent | 0e2395293bff089536b97131b32fea8b58bca0ba (diff) | |
| download | ffmpeg-2ee89553aafee6b8f8df0e7f602ac331ceeded3e.tar.gz | |
Merge commit '0e2395293bff089536b97131b32fea8b58bca0ba'
* commit '0e2395293bff089536b97131b32fea8b58bca0ba':
nut: Mark non-fatal errors as warnings
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/nutdec.c')
| -rw-r--r-- | libavformat/nutdec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 7ae7938bb6..286d1eee30 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -603,7 +603,9 @@ static int decode_info_header(NUTContext *nut) } if (stream_id_plus1 > s->nb_streams) { - av_log(s, AV_LOG_ERROR, "invalid stream id for info packet\n"); + av_log(s, AV_LOG_WARNING, + "invalid stream id %d for info packet\n", + stream_id_plus1); continue; } @@ -712,7 +714,7 @@ static int find_and_decode_index(NUTContext *nut) avio_seek(bc, filesize - 12, SEEK_SET); avio_seek(bc, filesize - avio_rb64(bc), SEEK_SET); if (avio_rb64(bc) != INDEX_STARTCODE) { - av_log(s, AV_LOG_ERROR, "no index at the end\n"); + av_log(s, AV_LOG_WARNING, "no index at the end\n"); if(s->duration<=0) s->duration = find_duration(nut, filesize); |