*/
/**
- * @file libavformat/idcin.c
+ * @file
* id Quake II CIN file demuxer by Mike Melanson (melanson@pcisys.net)
* For more information about the id CIN format, visit:
* http://www.csse.monash.edu.au/~timf/
return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, IDCIN_FPS);
idcin->video_stream_index = st->index;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_IDCIN;
st->codec->codec_tag = 0; /* no fourcc */
st->codec->width = width;
return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, IDCIN_FPS);
idcin->audio_stream_index = st->index;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_tag = 1;
st->codec->channels = channels;
st->codec->sample_rate = sample_rate;
url_fseek(pb, 4, SEEK_CUR);
chunk_size -= 4;
ret= av_get_packet(pb, pkt, chunk_size);
- if (ret != chunk_size)
- return AVERROR(EIO);
+ if (ret < 0)
+ return ret;
pkt->stream_index = idcin->video_stream_index;
pkt->pts = idcin->pts;
} else {
else
chunk_size = idcin->audio_chunk_size1;
ret= av_get_packet(pb, pkt, chunk_size);
- if (ret != chunk_size)
- return AVERROR(EIO);
+ if (ret < 0)
+ return ret;
pkt->stream_index = idcin->audio_stream_index;
pkt->pts = idcin->pts;