Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2015-07-05 20:02:04 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-07-06 02:02:35 +0300
commit859731d64271f4b30b1ceb9412092023d5991b1d (patch)
tree725f0b0ee951954ed5233ddcfee2fb7285226c0f /libavcodec
parent9476c4c67e68f573e37cb3e2d8f045d87e169205 (diff)
lavc/utils: get rid of add_metadata_from_side_data forward declaration
Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index e1870f5460..b80b4e781f 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;