From: Carl Hetherington <cth@carlh.net>
Date: Wed, 23 Jun 2021 15:17:49 +0000 (+0200)
Subject: Improve some error messages.
X-Git-Tag: v2.15.155~3
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5523c5b7c0572616d9d76786d0140e6f7f3e7174

Improve some error messages.
---

diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index 0b40b8f83..54fb1c468 100644
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -166,7 +166,7 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
 
 	int r = avformat_find_stream_info(format_context, 0);
 	if (r < 0) {
-		throw DecodeError (N_("avcodec_find_stream_info"), name_for_errors, r);
+		throw DecodeError (N_("avcodec_find_stream_info"), name_for_errors, r, *_path);
 	}
 
 	DCPOMATIC_ASSERT (format_context->nb_streams == 1);
@@ -181,28 +181,28 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
 
 	auto context = avcodec_alloc_context3 (codec);
 	if (!context) {
-		throw DecodeError (N_("avcodec_alloc_context3"), name_for_errors);
+		throw DecodeError (N_("avcodec_alloc_context3"), name_for_errors, *_path);
 	}
 
 	r = avcodec_open2 (context, codec, 0);
 	if (r < 0) {
-		throw DecodeError (N_("avcodec_open2"), name_for_errors, r);
+		throw DecodeError (N_("avcodec_open2"), name_for_errors, r, *_path);
 	}
 
 	AVPacket packet;
 	r = av_read_frame (format_context, &packet);
 	if (r < 0) {
-		throw DecodeError (N_("av_read_frame"), name_for_errors, r);
+		throw DecodeError (N_("av_read_frame"), name_for_errors, r, *_path);
 	}
 
 	r = avcodec_send_packet (context, &packet);
 	if (r < 0) {
-		throw DecodeError (N_("avcodec_send_packet"), name_for_errors, r);
+		throw DecodeError (N_("avcodec_send_packet"), name_for_errors, r, *_path);
 	}
 
 	r = avcodec_receive_frame (context, frame);
 	if (r < 0) {
-		throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r);
+		throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r, *_path);
 	}
 
 	_image = make_shared<Image>(frame);