@@ -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"
@@ -21,6 +21,7 @@
*/
#include "libavutil/channel_layout.h"
+#include "libavutil/dict_internal.h"
#include "avformat.h"
#include "internal.h"
#include "avio_internal.h"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -22,6 +22,7 @@
#include "avstring.h"
#include "dict.h"
+#include "dict_internal.h"
#include "internal.h"
#include "mem.h"
#include "time_internal.h"
new file mode 100644
@@ -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 <stdint.h>
+
+#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 */
@@ -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 */
It is used almost nowhere, so it needn't be auto-included almost everywhere. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- 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