X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2F4xm.c;h=3d9c5aea12908347dd23f7bc3298810f7aaff04d;hb=e1a8164d62fb8d1943b3f7a66500f0315ca8fe76;hp=3bb8bbdbdc35b3aa2d98db3812146511c1e71549;hpb=259a960f1b74339626f8da890cc261a4043097fe;p=ffmpeg diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 3bb8bbdbdc3..3d9c5aea129 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -28,8 +28,9 @@ */ #include "libavutil/intreadwrite.h" -#include "libavutil/intfloat_readwrite.h" +#include "libavutil/intfloat.h" #include "avformat.h" +#include "internal.h" #define RIFF_TAG MKTAG('R', 'I', 'F', 'F') #define FOURXMV_TAG MKTAG('4', 'X', 'M', 'V') @@ -130,7 +131,7 @@ static int fourxm_read_header(AVFormatContext *s, size = AV_RL32(&header[i + 4]); if (fourcc_tag == std__TAG) { - fourxm->fps = av_int2flt(AV_RL32(&header[i + 12])); + fourxm->fps = av_int2float(AV_RL32(&header[i + 12])); } else if (fourcc_tag == vtrk_TAG) { /* check that there is enough data */ if (size != vtrk_SIZE) { @@ -146,7 +147,7 @@ static int fourxm_read_header(AVFormatContext *s, ret= AVERROR(ENOMEM); goto fail; } - av_set_pts_info(st, 60, 1, fourxm->fps); + avpriv_set_pts_info(st, 60, 1, fourxm->fps); fourxm->video_stream_index = st->index; @@ -206,7 +207,7 @@ static int fourxm_read_header(AVFormatContext *s, } st->id = current_track; - av_set_pts_info(st, 60, 1, fourxm->tracks[current_track].sample_rate); + avpriv_set_pts_info(st, 60, 1, fourxm->tracks[current_track].sample_rate); fourxm->tracks[current_track].stream_index = st->index;