Commit 8defd0ca authored by Carl Eugen Hoyos's avatar 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
parent da44bbef
...@@ -114,14 +114,15 @@ fail: ...@@ -114,14 +114,15 @@ fail:
static int write_packet(AVFormatContext *s, AVPacket *pkt) static int write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
ChromaprintMuxContext *cpr = s->priv_data; 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) static int write_trailer(AVFormatContext *s)
{ {
ChromaprintMuxContext *cpr = s->priv_data; ChromaprintMuxContext *cpr = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
void *fp = NULL, *enc_fp = NULL; void *fp = NULL;
char *enc_fp = NULL;
int size, enc_size, ret = AVERROR(EINVAL); int size, enc_size, ret = AVERROR(EINVAL);
if (!chromaprint_finish(cpr->ctx)) { if (!chromaprint_finish(cpr->ctx)) {
...@@ -129,7 +130,7 @@ static int write_trailer(AVFormatContext *s) ...@@ -129,7 +130,7 @@ static int write_trailer(AVFormatContext *s)
goto fail; 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"); av_log(s, AV_LOG_ERROR, "Failed to retrieve fingerprint\n");
goto fail; goto fail;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment