Browse Source

Merge commit '0e2395293bff089536b97131b32fea8b58bca0ba'

* commit '0e2395293bff089536b97131b32fea8b58bca0ba':
  nut: Mark non-fatal errors as warnings

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
tags/n3.0
Hendrik Leppkes 10 years ago
parent
commit
2ee89553aa
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      libavformat/nutdec.c

+ 4
- 2
libavformat/nutdec.c View File

@@ -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);


Loading…
Cancel
Save