*/
#include "libavutil/intreadwrite.h"
-#include "libavutil/intfloat_readwrite.h"
+#include "libavutil/intfloat.h"
#include "avformat.h"
#include "internal.h"
return 0;
}
-static int thp_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
+static int thp_read_header(AVFormatContext *s)
{
ThpDemuxContext *thp = s->priv_data;
AVStream *st;
avio_rb32(pb); /* Max buf size. */
avio_rb32(pb); /* Max samples. */
- thp->fps = av_d2q(av_int2flt(avio_rb32(pb)), INT_MAX);
+ thp->fps = av_d2q(av_int2float(avio_rb32(pb)), INT_MAX);
thp->framecnt = avio_rb32(pb);
thp->first_framesz = avio_rb32(pb);
avio_rb32(pb); /* Data size. */
is required. */
avpriv_set_pts_info(st, 64, thp->fps.den, thp->fps.num);
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = CODEC_ID_THP;
+ st->codec->codec_id = AV_CODEC_ID_THP;
st->codec->codec_tag = 0; /* no fourcc */
st->codec->width = avio_rb32(pb);
st->codec->height = avio_rb32(pb);
return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = CODEC_ID_ADPCM_THP;
+ st->codec->codec_id = AV_CODEC_ID_ADPCM_THP;
st->codec->codec_tag = 0; /* no fourcc */
st->codec->channels = avio_rb32(pb); /* numChannels. */
st->codec->sample_rate = avio_rb32(pb); /* Frequency. */
}
pkt->stream_index = thp->audio_stream_index;
+ if (thp->audiosize >= 8)
+ pkt->duration = AV_RB32(&pkt->data[4]);
+
thp->audiosize = 0;
thp->frame++;
}