Commit 79f342d8 authored by ods15's avatar ods15

Update to libnut API, non-negative errors


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7094 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 728762ef
...@@ -206,7 +206,7 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { ...@@ -206,7 +206,7 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) {
int ret, i; int ret, i;
if ((ret = nut_read_headers(nut, &s, NULL))) { 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); nut_demuxer_uninit(nut);
return -1; return -1;
} }
...@@ -262,10 +262,13 @@ static int nut_read_packet(AVFormatContext * avf, AVPacket * pkt) { ...@@ -262,10 +262,13 @@ static int nut_read_packet(AVFormatContext * avf, AVPacket * pkt) {
nut_packet_t pd; nut_packet_t pd;
int ret; int ret;
while ((ret = nut_read_next_packet(priv->nut, &pd)) < 0) ret = nut_read_next_packet(priv->nut, &pd);
av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(-ret));
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; if (pd.flags & NUT_FLAG_KEY) pkt->flags |= PKT_FLAG_KEY;
pkt->pts = pd.pts; pkt->pts = pd.pts;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment