From 04b72178724ed08934e276c959a6f1a154e1e7d4 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 27 Aug 2022 17:49:52 +0200 Subject: [PATCH] avutil/dict: Move avpriv_dict_set_timestamp() to a header of its own It is used almost nowhere, so it needn't be auto-included almost everywhere. Signed-off-by: Andreas Rheinhardt --- libavformat/flvdec.c | 1 + libavformat/ifv.c | 1 + libavformat/matroskadec.c | 1 + libavformat/mov.c | 1 + libavformat/mux_utils.c | 1 + libavformat/mxfdec.c | 1 + libavutil/dict.c | 1 + libavutil/dict_internal.h | 37 +++++++++++++++++++++++++++++++++++++ libavutil/internal.h | 12 ------------ 9 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 libavutil/dict_internal.h diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 10f0ea7736..7f9d795044 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -28,6 +28,7 @@ #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/dict.h" +#include "libavutil/dict_internal.h" #include "libavutil/opt.h" #include "libavutil/internal.h" #include "libavutil/intfloat.h" diff --git a/libavformat/ifv.c b/libavformat/ifv.c index 490608c5de..694abd951b 100644 --- a/libavformat/ifv.c +++ b/libavformat/ifv.c @@ -21,6 +21,7 @@ */ #include "libavutil/channel_layout.h" +#include "libavutil/dict_internal.h" #include "avformat.h" #include "internal.h" #include "avio_internal.h" diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index ad7ee390a2..16a3e93611 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -38,6 +38,7 @@ #include "libavutil/base64.h" #include "libavutil/bprint.h" #include "libavutil/dict.h" +#include "libavutil/dict_internal.h" #include "libavutil/display.h" #include "libavutil/intfloat.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/mov.c b/libavformat/mov.c index 35e2271b14..df45408060 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -32,6 +32,7 @@ #include "libavutil/attributes.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" +#include "libavutil/dict_internal.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/intfloat.h" diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c index 8b95fc5e7e..764c834fa2 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c @@ -20,6 +20,7 @@ */ #include "libavutil/dict.h" +#include "libavutil/dict_internal.h" #include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/mem.h" diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index feebff67aa..e63e803aa5 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -53,6 +53,7 @@ #include "libavcodec/bytestream.h" #include "libavcodec/internal.h" #include "libavutil/channel_layout.h" +#include "libavutil/dict_internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/parseutils.h" #include "libavutil/timecode.h" diff --git a/libavutil/dict.c b/libavutil/dict.c index 9d3d96c58b..a4f638a1fc 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -22,6 +22,7 @@ #include "avstring.h" #include "dict.h" +#include "dict_internal.h" #include "internal.h" #include "mem.h" #include "time_internal.h" diff --git a/libavutil/dict_internal.h b/libavutil/dict_internal.h new file mode 100644 index 0000000000..6d5b0dc2b0 --- /dev/null +++ b/libavutil/dict_internal.h @@ -0,0 +1,37 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_DICT_INTERNAL_H +#define AVUTIL_DICT_INTERNAL_H + +#include + +#include "dict.h" + +/** + * Set a dictionary value to an ISO-8601 compliant timestamp string. + * + * @param dict pointer to a pointer to a dictionary struct. If *dict is NULL + * a dictionary struct is allocated and put in *dict. + * @param key metadata key + * @param timestamp unix timestamp in microseconds + * @return <0 on error + */ +int avpriv_dict_set_timestamp(AVDictionary **dict, const char *key, int64_t timestamp); + +#endif /* AVUTIL_DICT_INTERNAL_H */ diff --git a/libavutil/internal.h b/libavutil/internal.h index 8ee5a101c6..8bdc7b3ac8 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -41,7 +41,6 @@ #include "config.h" #include "attributes.h" #include "timer.h" -#include "dict.h" #include "macros.h" #include "pixfmt.h" @@ -230,15 +229,4 @@ static av_always_inline av_const int avpriv_mirror(int x, int w) void ff_check_pixfmt_descriptors(void); -/** - * Set a dictionary value to an ISO-8601 compliant timestamp string. - * - * @param dict pointer to a pointer to a dictionary struct. If *dict is NULL - * a dictionary struct is allocated and put in *dict. - * @param key metadata key - * @param timestamp unix timestamp in microseconds - * @return <0 on error - */ -int avpriv_dict_set_timestamp(AVDictionary **dict, const char *key, int64_t timestamp); - #endif /* AVUTIL_INTERNAL_H */