RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0e2395293bff089536b97131b32fea8b58bca0ba' 

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-11-29 16:17:36 +01:00
parent 2e4d10ae55 0e2395293b
commit 2ee89553aa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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