aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-05-17 15:32:05 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-05-20 13:33:38 +0200
commit26f3e79114660de079bc9d784070d70b64e18ee5 (patch)
tree1f3f1ad15447c333ad1829642c592e623d83e57b
parent583c3d45fab6ed9aecd96f6c5ce02a789ca13e2c (diff)
downloadffmpeg-26f3e79114660de079bc9d784070d70b64e18ee5.tar.gz
avformat/tee: Constify AVDictionaryEntry* pointee where possible
This is in preparation for using av_dict_iterate(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavformat/tee.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/tee.c b/libavformat/tee.c
index 1cbbb80dbb..b252b61a64 100644
--- a/libavformat/tee.c
+++ b/libavformat/tee.c
@@ -158,7 +158,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave)
{
int i, ret;
AVDictionary *options = NULL, *bsf_options = NULL;
- AVDictionaryEntry *entry;
+ const AVDictionaryEntry *entry;
char *filename;
char *format = NULL, *select = NULL, *on_fail = NULL;
char *use_fifo = NULL, *fifo_options_str = NULL;
@@ -172,15 +172,16 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave)
return ret;
#define CONSUME_OPTION(option, field, action) do { \
- if ((entry = av_dict_get(options, option, NULL, 0))) { \
- field = entry->value; \
+ AVDictionaryEntry *en = av_dict_get(options, option, NULL, 0); \
+ if (en) { \
+ field = en->value; \
{ action } \
av_dict_set(&options, option, NULL, 0); \
} \
} while (0)
#define STEAL_OPTION(option, field) \
CONSUME_OPTION(option, field, \
- entry->value = NULL; /* prevent it from being freed */)
+ en->value = NULL; /* prevent it from being freed */)
#define PROCESS_OPTION(option, field, function, on_error) \
CONSUME_OPTION(option, field, if ((ret = function) < 0) { { on_error } goto end; })