Merge commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8'

[ffmpeg] / libavformat / riff.h

diff --git a/libavformat/riff.h b/libavformat/riff.h
index b59c6065a04b0ec7e5dab168b0aa357c41955623..dba38034e9d7befbb97b536a4dcd0b0850d7c5bd 100644 (file)
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -91,7 +91,7 @@ static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
     return memcmp(g1, g2, sizeof(ff_asf_guid));
 }
 
-void ff_get_guid(AVIOContext *s, ff_asf_guid *g);
+int ff_get_guid(AVIOContext *s, ff_asf_guid *g);
 void ff_put_guid(AVIOContext *s, const ff_asf_guid *g);
 const ff_asf_guid *get_codec_guid(enum AVCodecID id, const AVCodecGuid *av_guid);