[FFmpeg-cvslog] avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 17 22:51:07 2014 +0100| [ed7f1a5c207636c80795e683d7808411d3c7ab3e] | committer: Michael Niedermayer

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed7f1a5c207636c80795e683d7808411d3c7ab3e
---

 libavformat/metadata.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index fc3a9d7..b9b6de7 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))) {