[FFmpeg-devel] [PATCH 4/4] lavc/utils: get rid of add_metadata_from_side_data forward declaration

[Marton Balint]

Signed-off-by: Marton Balint <c...@passwd.hu>
---
 libavcodec/utils.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index e1870f5..b80b4e7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -739,7 +739,17 @@ FF_ENABLE_DEPRECATION_WARNINGS
     }
 }
 
-static int add_metadata_from_side_data(AVPacket *avpkt, AVFrame *frame);
+static int add_metadata_from_side_data(AVPacket *avpkt, AVFrame *frame)
+{
+    int size;
+    const uint8_t *side_metadata;
+
+    AVDictionary **frame_md = avpriv_frame_get_metadatap(frame);
+
+    side_metadata = av_packet_get_side_data(avpkt,
+                                            AV_PKT_DATA_STRINGS_METADATA, 
&size);
+    return av_packet_unpack_dictionary(side_metadata, size, frame_md);
+}
 
 int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
 {
@@ -2299,18 +2309,6 @@ fail:
     return AVERROR_INVALIDDATA;
 }
 
-static int add_metadata_from_side_data(AVPacket *avpkt, AVFrame *frame)
-{
-    int size;
-    const uint8_t *side_metadata;
-
-    AVDictionary **frame_md = avpriv_frame_get_metadatap(frame);
-
-    side_metadata = av_packet_get_side_data(avpkt,
-                                            AV_PKT_DATA_STRINGS_METADATA, 
&size);
-    return av_packet_unpack_dictionary(side_metadata, size, frame_md);
-}
-
 static int unrefcount_frame(AVCodecInternal *avci, AVFrame *frame)
 {
     int ret;
-- 
2.1.4

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel