Add support for TCP as lower transport in the RTSP muxer

[ffmpeg] / libavformat / flacdec.c

diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index d7f1e715d8a52536fb0315aa28a7cbbe7233a361..a1bb51b074d6b39c67449f7f13bb7d79cbe6dfaf 100644 (file)
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -24,6 +24,7 @@
 #include "raw.h"
 #include "id3v2.h"
 #include "oggdec.h"
+#include "vorbiscomment.h"
 
 static int flac_read_header(AVFormatContext *s,
                              AVFormatParameters *ap)
@@ -70,7 +71,7 @@ static int flac_read_header(AVFormatContext *s,
             }
             if (get_buffer(s->pb, buffer, metadata_size) != metadata_size) {
                 av_freep(&buffer);
-                return AVERROR_IO;
+                return AVERROR(EIO);
             }
             break;
         /* skip metadata block for unsupported types */
@@ -113,7 +114,7 @@ static int flac_read_header(AVFormatContext *s,
             }
             /* process supported blocks other than STREAMINFO */
             if (metadata_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
-                if (ff_vorbis_comment(s, buffer, metadata_size)) {
+                if (ff_vorbis_comment(s, &s->metadata, buffer, metadata_size)) {
                     av_log(s, AV_LOG_WARNING, "error parsing VorbisComment metadata\n");
                 }
             }