diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 22:51:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 23:09:52 +0100 |
| commit | ed7f1a5c207636c80795e683d7808411d3c7ab3e (patch) | |
| tree | a64c18d8ca34c0b8c116679bf1a04c0d3d2faca7 | |
| parent | 447d71b89213ea52480cc113b5389453d4167c03 (diff) | |
| download | ffmpeg-ed7f1a5c207636c80795e683d7808411d3c7ab3e.tar.gz | |
avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/metadata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/metadata.c b/libavformat/metadata.c index fc3a9d7d55..b9b6de7972 100644 --- a/libavformat/metadata.c +++ b/libavformat/metadata.c @@ -33,7 +33,7 @@ void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv, AVDictionary *dst = NULL; const char *key; - if (d_conv == s_conv) + if (d_conv == s_conv || !pm) return; while ((mtag = av_dict_get(*pm, "", mtag, AV_DICT_IGNORE_SUFFIX))) { |