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

Merge commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5' 

* commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5':
  avconv: do not stop processing the input packet on decoding error

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-27 20:34:42 +02:00
parent a50b008227 9a5e4fbec8
commit a5f409bcc0
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ffmpeg.c
View File

@ -2268,8 +2268,13 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt)
return -1;
}
if (ret < 0 && !(!pkt && ist->decoding_needed))
return ret;
if (ret < 0) {
av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d: %s\n",
ist->file_index, ist->st->index, av_err2str(ret));
if (exit_on_error)
exit_program(1);
break;
}
avpkt.dts=
avpkt.pts= AV_NOPTS_VALUE;
@ -3772,13 +3777,7 @@ static int process_input(int file_index)
sub2video_heartbeat(ist, pkt.pts);
ret = process_input_packet(ist, &pkt);
if (ret < 0) {
av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d: %s\n",
ist->file_index, ist->st->index, av_err2str(ret));
if (exit_on_error)
exit_program(1);
}
process_input_packet(ist, &pkt);
discard_packet:
av_free_packet(&pkt);