[FFmpeg-cvslog] lavf/chromaprint: Silence compilation warnings
Carl Eugen Hoyos
git at videolan.org
Sun Apr 5 23:48:23 EEST 2020
ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Tue Aug 13 12:42:27 2019 +0200| [8defd0ca7b4ac6658e6beb9dcdc0183b2d3e53d8] | committer: Carl Eugen Hoyos
lavf/chromaprint: Silence compilation warnings
Fixes the following warnings:
libavformat/chromaprint.c:117:42: warning: passing argument 2 of ‘chromaprint_feed’ from incompatible pointer type
libavformat/chromaprint.c:132:52: warning: passing argument 2 of ‘chromaprint_get_raw_fingerprint’ from incompatible pointer type
libavformat/chromaprint.c:143:71: warning: passing argument 4 of ‘chromaprint_encode_fingerprint’ from incompatible pointer type
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8defd0ca7b4ac6658e6beb9dcdc0183b2d3e53d8
---
libavformat/chromaprint.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c
index faa92ca0db..0cd7cdeb26 100644
--- a/libavformat/chromaprint.c
+++ b/libavformat/chromaprint.c
@@ -114,14 +114,15 @@ fail:
static int write_packet(AVFormatContext *s, AVPacket *pkt)
{
ChromaprintMuxContext *cpr = s->priv_data;
- return chromaprint_feed(cpr->ctx, pkt->data, pkt->size / 2) ? 0 : AVERROR(EINVAL);
+ return chromaprint_feed(cpr->ctx, (const int16_t *)pkt->data, pkt->size / 2) ? 0 : AVERROR(EINVAL);
}
static int write_trailer(AVFormatContext *s)
{
ChromaprintMuxContext *cpr = s->priv_data;
AVIOContext *pb = s->pb;
- void *fp = NULL, *enc_fp = NULL;
+ void *fp = NULL;
+ char *enc_fp = NULL;
int size, enc_size, ret = AVERROR(EINVAL);
if (!chromaprint_finish(cpr->ctx)) {
@@ -129,7 +130,7 @@ static int write_trailer(AVFormatContext *s)
goto fail;
}
- if (!chromaprint_get_raw_fingerprint(cpr->ctx, &fp, &size)) {
+ if (!chromaprint_get_raw_fingerprint(cpr->ctx, (uint32_t **)&fp, &size)) {
av_log(s, AV_LOG_ERROR, "Failed to retrieve fingerprint\n");
goto fail;
}
More information about the ffmpeg-cvslog
mailing list