avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ed7f1a5c · Michael Niedermayer · 447d71b8 · ed7f1a5c
Commit ed7f1a5c authored Jan 17, 2014 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

metadata.c libavformat/metadata.c +1 -1

No files found.
--- 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))) {