RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

update to libnut API, non-negative errors 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20954 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ods15 2006-11-16 07:07:22 +00:00
parent d8bdc48eb2
commit f85f460eb9
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libmpdemux/demux_nut.c
View File

@ -79,8 +79,7 @@ static demuxer_t * demux_open_nut(demuxer_t * demuxer) {
int i;
if ((ret = nut_read_headers(nut, &s, NULL))) {
if (ret < 0) mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n",
nut_error(-ret));
mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(ret));
nut_demuxer_uninit(nut);
free(priv);
return NULL;
@ -183,11 +182,12 @@ static int demux_nut_fill_buffer(demuxer_t * demuxer, demux_stream_t * dsds) {
if (stream_eof(demuxer->stream)) return 0;
ret = nut_read_next_packet(nut, &pd);
if (ret < 0) {
mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n",
nut_error(-ret));
if (ret) {
if (ret != NUT_ERR_EOF)
mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n",
nut_error(ret));
return 0; // fatal error
}
if (ret) return 0; // fatal error
pts = (double)pd.pts * priv->s[pd.stream].time_base.nom /
priv->s[pd.stream].time_base.den;
@ -204,11 +204,11 @@ static int demux_nut_fill_buffer(demuxer_t * demuxer, demux_stream_t * dsds) {
else {
uint8_t buf[pd.len];
ret = nut_read_frame(nut, &pd.len, buf);
if (ret < 0) {
if (ret) {
mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n",
nut_error(-ret));
nut_error(ret));
return 0; // fatal error
}
if (ret) return 0; // fatal error
return 1;
}
@ -222,11 +222,11 @@ static int demux_nut_fill_buffer(demuxer_t * demuxer, demux_stream_t * dsds) {
dp->flags= (pd.flags & NUT_FLAG_KEY) ? 0x10 : 0;
ret = nut_read_frame(nut, &pd.len, dp->buffer);
if (ret < 0) {
if (ret) {
mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n",
nut_error(-ret));
nut_error(ret));
return 0; // fatal error
}
if (ret) return 0; // fatal error
ds_add_packet(ds, dp); // append packet to DS stream
return 1;