From 2c1533e4e5568a8bb4f538cfb845d07b0637380c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 20 Apr 2013 02:50:09 +0100
Subject: Be more careful about the validity of s->metadata.

---
 src/lib/ffmpeg_decoder.cc | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.cc')

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 7c88c3c35..8e09810cb 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -453,18 +453,20 @@ string
 FFmpegDecoder::stream_name (AVStream* s) const
 {
 	stringstream n;
-	
-	AVDictionaryEntry const * lang = av_dict_get (s->metadata, N_("language"), 0, 0);
-	if (lang) {
-		n << lang->value;
-	}
-	
-	AVDictionaryEntry const * title = av_dict_get (s->metadata, N_("title"), 0, 0);
-	if (title) {
-		if (!n.str().empty()) {
-			n << N_(" ");
+
+	if (s->metadata) {
+		AVDictionaryEntry const * lang = av_dict_get (s->metadata, N_("language"), 0, 0);
+		if (lang) {
+			n << lang->value;
+		}
+		
+		AVDictionaryEntry const * title = av_dict_get (s->metadata, N_("title"), 0, 0);
+		if (title) {
+			if (!n.str().empty()) {
+				n << N_(" ");
+			}
+			n << title->value;
 		}
-		n << title->value;
 	}
 
 	if (n.str().empty()) {
-- 
cgit v1.2.3