X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fadp.c;h=6d5f9d274ec3adb8d1435ed0dd844cac1f6637be;hb=bc70684e74a185d7b80c8b80bdedda659cb581b8;hp=3914857ad53a070093f0db5e23cc1c155e705bc9;hpb=1811b7d1f5330e04a48b1d6425cf1ef6ed776ed1;p=ffmpeg diff --git a/libavformat/adp.c b/libavformat/adp.c index 3914857ad53..6d5f9d274ec 100644 --- a/libavformat/adp.c +++ b/libavformat/adp.c @@ -24,7 +24,7 @@ #include "avformat.h" #include "internal.h" -static int adp_probe(AVProbeData *p) +static int adp_probe(const AVProbeData *p) { int i, changes = 0; uint8_t last = 0; @@ -75,20 +75,15 @@ static int adp_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_EOF; ret = av_get_packet(s->pb, pkt, size); + if (ret < 0) + return ret; - if (ret != size) { - if (ret < 0) { - av_packet_unref(pkt); - return ret; - } - av_shrink_packet(pkt, ret); - } pkt->stream_index = 0; return ret; } -AVInputFormat ff_adp_demuxer = { +const AVInputFormat ff_adp_demuxer = { .name = "adp", .long_name = NULL_IF_CONFIG_SMALL("ADP"), .read_probe = adp_probe,