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

Update to libnut API, non-negative errors 

Originally committed as revision 7094 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Oded Shimon 2006-11-16 07:33:25 +00:00
parent 3666f75d33
commit e4bb70838f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/libnut.c
View File

@ -206,7 +206,7 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) {
int ret, i;
if ((ret = nut_read_headers(nut, &s, NULL))) {
if (ret < 0) av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(-ret));
av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret));
nut_demuxer_uninit(nut);
return -1;
}
@ -262,10 +262,13 @@ static int nut_read_packet(AVFormatContext * avf, AVPacket * pkt) {
nut_packet_t pd;
int ret;
while ((ret = nut_read_next_packet(priv->nut, &pd)) < 0)
av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(-ret));
ret = nut_read_next_packet(priv->nut, &pd);
if (ret || av_new_packet(pkt, pd.len) < 0) return -1;
if (ret || av_new_packet(pkt, pd.len) < 0) {
if (ret != NUT_ERR_EOF)
av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret));
return -1;
}
if (pd.flags & NUT_FLAG_KEY) pkt->flags |= PKT_FLAG_KEY;
pkt->pts = pd.pts;