X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fpaf.c;h=a31d01502b2cfc36ea550d5d19a30a1386842368;hb=4106013523f46824d32fd5b469ea264fbdfdb591;hp=fa30cdd72a0c0e83516bb5404c834e5e0815317b;hpb=5ab44ff20cdc0e05adecbd0cd352d25fcb930094;p=ffmpeg diff --git a/libavformat/paf.c b/libavformat/paf.c index fa30cdd72a0..a31d01502b2 100644 --- a/libavformat/paf.c +++ b/libavformat/paf.c @@ -53,7 +53,7 @@ typedef struct PAFDemuxContext { int got_audio; } PAFDemuxContext; -static int read_probe(AVProbeData *p) +static int read_probe(const AVProbeData *p) { if ((p->buf_size >= strlen(MAGIC)) && !memcmp(p->buf, MAGIC, strlen(MAGIC))) @@ -194,7 +194,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) PAFDemuxContext *p = s->priv_data; AVIOContext *pb = s->pb; uint32_t count, offset; - int size, i; + int size, i, ret; if (p->current_frame >= p->nb_frames) return AVERROR_EOF; @@ -203,8 +203,8 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_EOF; if (p->got_audio) { - if (av_new_packet(pkt, p->audio_size) < 0) - return AVERROR(ENOMEM); + if ((ret = av_new_packet(pkt, p->audio_size)) < 0) + return ret; memcpy(pkt->data, p->temp_audio_frame, p->audio_size); pkt->duration = PAF_SOUND_SAMPLES * (p->audio_size / PAF_SOUND_FRAME_SIZE); @@ -244,8 +244,8 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) size = p->video_size - p->frames_offset_table[p->current_frame]; - if (av_new_packet(pkt, size) < 0) - return AVERROR(ENOMEM); + if ((ret = av_new_packet(pkt, size)) < 0) + return ret; pkt->stream_index = 0; pkt->duration = 1;