From 7d756230c27b61537591b254128b11ad83274d53 Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Sat, 11 Apr 2015 20:53:09 +0200 Subject: [PATCH] Make raop_metadata_free private again and change a comment in http.c --- src/http.c | 4 ++-- src/raop.c | 2 +- src/raop.h | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/http.c b/src/http.c index 6b56c78c..5ccea129 100644 --- a/src/http.c +++ b/src/http.c @@ -484,7 +484,7 @@ http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only) * headers, so we must instead open the stream ourselves to get the metadata. * Sorry about the extra connections, you radio streaming people! * - * TODO: Get packet metadata from fmtctx->packet_buffer + * It is not possible to get the packet metadata with these versions of ffmpeg */ struct http_icy_metadata * http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only) @@ -496,7 +496,7 @@ http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only) int got_header; int ret; - /* Can only get header metadata at the moment */ + /* Can only get header metadata */ if (packet_only) return NULL; diff --git a/src/raop.c b/src/raop.c index 702ca90a..fb7ff0d0 100644 --- a/src/raop.c +++ b/src/raop.c @@ -708,7 +708,7 @@ raop_crypt_encrypt_aes_key_base64(void) /* RAOP metadata */ -void +static void raop_metadata_free(struct raop_metadata *rmd) { evbuffer_free(rmd->metadata); diff --git a/src/raop.h b/src/raop.h index 33e24579..e596dbb1 100644 --- a/src/raop.h +++ b/src/raop.h @@ -91,9 +91,6 @@ enum raop_session_state typedef void (*raop_status_cb)(struct raop_device *dev, struct raop_session *rs, enum raop_session_state status); -void -raop_metadata_free(struct raop_metadata *rmd); - void raop_metadata_purge(void);