From: Zhao Zhili <zhiliz...@tencent.com>
---
libavformat/hls.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 6623c80309..6139b8525e 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1353,16 +1353,22 @@ static int open_input(HLSContext *c, struct playlist
*pls, struct segment *seg,
if (seg->key_type == KEY_AES_128 || seg->key_type == KEY_SAMPLE_AES) {
if (strcmp(seg->key, pls->key_url)) {
AVIOContext *pb = NULL;
- if (open_url(pls->parent, &pb, seg->key, &c->avio_opts, NULL,
NULL) == 0) {
+
+ ret = open_url(pls->parent, &pb, seg->key, &c->avio_opts, NULL,
NULL);
+ if (ret >= 0) {
ret = avio_read(pb, pls->key, sizeof(pls->key));
if (ret != sizeof(pls->key)) {
- av_log(pls->parent, AV_LOG_ERROR, "Unable to read key file
%s\n",
- seg->key);
+ if (ret < 0)
+ av_log(pls->parent, AV_LOG_ERROR, "Unable to read key
file %s, %s\n",
+ seg->key, av_err2str(ret));
+ else
+ av_log(pls->parent, AV_LOG_ERROR, "Unable to read key
file %s, read bytes %d != %zu\n",
+ seg->key, ret, sizeof(pls->key));
}
ff_format_io_close(pls->parent, &pb);
} else {
- av_log(pls->parent, AV_LOG_ERROR, "Unable to open key file
%s\n",
- seg->key);
+ av_log(pls->parent, AV_LOG_ERROR, "Unable to open key file %s,
%s\n",
+ seg->key, av_err2str(ret));
}
av_strlcpy(pls->key_url, seg->key, sizeof(pls->key_url));
}
--
2.46.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
