X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fpaf.c;h=8fe2ac56382c5eb0e143423e27a91982ff61725f;hb=5864ce13d188260998bbf49a2a774fa9bd445c10;hp=aeebaba059811da1cbc870a748ac95ac67d71ab6;hpb=9c6e23f5d2f9fa58d54adf35b4cde4e351fb7d64;p=ffmpeg diff --git a/libavformat/paf.c b/libavformat/paf.c index aeebaba0598..8fe2ac56382 100644 --- a/libavformat/paf.c +++ b/libavformat/paf.c @@ -107,7 +107,7 @@ static int read_header(AVFormatContext *s) avio_skip(pb, 4); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; vst->codec->codec_tag = 0; - vst->codec->codec_id = CODEC_ID_PAF_VIDEO; + vst->codec->codec_id = AV_CODEC_ID_PAF_VIDEO; avpriv_set_pts_info(vst, 64, 1, 10); ast = avformat_new_stream(s, 0); @@ -117,7 +117,7 @@ static int read_header(AVFormatContext *s) ast->start_time = 0; ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; ast->codec->codec_tag = 0; - ast->codec->codec_id = CODEC_ID_PAF_AUDIO; + ast->codec->codec_id = AV_CODEC_ID_PAF_AUDIO; ast->codec->channels = 2; ast->codec->sample_rate = 22050; avpriv_set_pts_info(ast, 64, 1, 22050); @@ -200,7 +200,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(ENOMEM); memcpy(pkt->data, p->temp_audio_frame, p->audio_size); - pkt->duration = PAF_SOUND_SAMPLES * p->audio_size / PAF_SOUND_FRAME_SIZE; + pkt->duration = PAF_SOUND_SAMPLES * (p->audio_size / PAF_SOUND_FRAME_SIZE); pkt->flags |= AV_PKT_FLAG_KEY; pkt->stream_index = 1; p->got_audio = 0;