X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Favs.c;h=8f3dd27daecbf9c26f8e51a15dbaa566000e3c0b;hb=a8cedbebf163ad376abc4703b3156c44d0858404;hp=492cb0b0c66619c13eec876e0424f2b5ea07995a;hpb=31801ded9a863252a7e64d0edc4e0c6c3adb72ad;p=ffmpeg diff --git a/libavformat/avs.c b/libavformat/avs.c index 492cb0b0c66..8f3dd27daec 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -55,7 +55,7 @@ static int avs_probe(AVProbeData * p) return 0; } -static int avs_read_header(AVFormatContext * s, AVFormatParameters * ap) +static int avs_read_header(AVFormatContext * s) { AvsFormat *avs = s->priv_data; @@ -124,7 +124,7 @@ static int avs_read_audio_packet(AVFormatContext * s, AVPacket * pkt) int ret, size; size = avio_tell(s->pb); - ret = voc_get_packet(s, pkt, avs->st_audio, avs->remaining_audio_size); + ret = ff_voc_get_packet(s, pkt, avs->st_audio, avs->remaining_audio_size); size = avio_tell(s->pb) - size; avs->remaining_audio_size -= size; @@ -188,8 +188,8 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt) avs->st_video->codec->height = avs->height; avs->st_video->codec->bits_per_coded_sample=avs->bits_per_sample; avs->st_video->nb_frames = avs->nb_frames; - avs->st_video->codec->time_base = (AVRational) { - 1, avs->fps}; + avs->st_video->r_frame_rate = avs->st_video->avg_frame_rate = + (AVRational){avs->fps, 1}; } return avs_read_video_packet(s, pkt, type, sub_type, size, palette, palette_size);