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

Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d' 

* commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d':
  sctp: Use AVERROR_BUG instead of abort()

Conflicts:
	libavformat/sctp.c

See: 2e59142fa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-10 20:51:52 +02:00
parent fc6aa30459 09e1ccc8cd
commit cec7afd036
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/sctp.c
View File

@ -298,7 +298,7 @@ static int sctp_write(URLContext *h, const uint8_t *buf, int size)
info.sinfo_stream = AV_RB16(buf); info.sinfo_stream = AV_RB16(buf);
if (info.sinfo_stream > s->max_streams) { if (info.sinfo_stream > s->max_streams) {
av_log(h, AV_LOG_ERROR, "bad input data\n"); av_log(h, AV_LOG_ERROR, "bad input data\n");
return AVERROR(EINVAL); return AVERROR_BUG;
} }
ret = ff_sctp_send(s->fd, buf + 2, size - 2, &info, MSG_EOR); ret = ff_sctp_send(s->fd, buf + 2, size - 2, &info, MSG_EOR);
} else } else