X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsdr2.c;h=373116a4a66a2474b0a4838d0c5f2f6612447687;hb=bc70684e74a185d7b80c8b80bdedda659cb581b8;hp=c9953336c5a48f4e03f4b3844214f4b61a180a0f;hpb=94346ab593f3fc0822f11d3e3f378f9944ad2d40;p=ffmpeg diff --git a/libavformat/sdr2.c b/libavformat/sdr2.c index c9953336c5a..373116a4a66 100644 --- a/libavformat/sdr2.c +++ b/libavformat/sdr2.c @@ -23,7 +23,7 @@ #include "avformat.h" #include "internal.h" -static int sdr2_probe(AVProbeData *p) +static int sdr2_probe(const AVProbeData *p) { if (AV_RL32(p->buf) != MKTAG('S', 'R', 'A', 1)) return 0; @@ -90,12 +90,11 @@ static int sdr2_read_packet(AVFormatContext *s, AVPacket *pkt) avio_skip(s->pb, 30); if (pos == FIRST) { - if (av_new_packet(pkt, next - 52 + 24) < 0) - return AVERROR(ENOMEM); + if ((ret = av_new_packet(pkt, next - 52 + 24)) < 0) + return ret; memcpy(pkt->data, header, 24); ret = avio_read(s->pb, pkt->data + 24, next - 52); if (ret < 0) { - av_packet_unref(pkt); return ret; } av_shrink_packet(pkt, ret + 24); @@ -110,7 +109,7 @@ static int sdr2_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; } -AVInputFormat ff_sdr2_demuxer = { +const AVInputFormat ff_sdr2_demuxer = { .name = "sdr2", .long_name = NULL_IF_CONFIG_SMALL("SDR2"), .read_probe = sdr2_probe,