[FFmpeg-cvslog] lavc/utils: get rid of add_metadata_from_side_data forward declaration

[Marton Balint]

ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Jul  5 19:02:04 2015 +0200| [859731d64271f4b30b1ceb9412092023d5991b1d] | committer: Michael Niedermayer

lavc/utils: get rid of add_metadata_from_side_data forward declaration

Signed-off-by: Marton Balint <cus at passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=859731d64271f4b30b1ceb9412092023d5991b1d
---

 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;