avformat/httpauth: do not decode plus sign to space in credentials

[ffmpeg] / libavformat / avs.c

diff --git a/libavformat/avs.c b/libavformat/avs.c
index 47fa41017dcc88d11c941df551a8655017dcbb60..54b2c3f2a9708923dad64de99bf04dd5301360d7 100644 (file)
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -114,7 +114,6 @@ avs_read_video_packet(AVFormatContext * s, AVPacket * pkt,
     pkt->data[palette_size + 3] = (size >> 8) & 0xFF;
     ret = avio_read(s->pb, pkt->data + palette_size + 4, size - 4) + 4;
     if (ret < size) {
-        av_packet_unref(pkt);
         return AVERROR(EIO);
     }
 
@@ -224,11 +223,6 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
     }
 }
 
-static int avs_read_close(AVFormatContext * s)
-{
-    return 0;
-}
-
 AVInputFormat ff_avs_demuxer = {
     .name           = "avs",
     .long_name      = NULL_IF_CONFIG_SMALL("Argonaut Games Creature Shock"),
@@ -236,5 +230,4 @@ AVInputFormat ff_avs_demuxer = {
     .read_probe     = avs_probe,
     .read_header    = avs_read_header,
     .read_packet    = avs_read_packet,
-    .read_close     = avs_read_close,
 };