From 2d097c16b833c532ac974a7f1fd05c0a1f3b7675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 14 Jul 2016 22:21:50 +0300
Subject: [PATCH] libopenh264enc: Return a more sensible error code in some
init failure paths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Previously they returned the default AVERROR_UNKNOWN.
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavcodec/libopenh264enc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index 8ef23f134f9..bf1cf25770a 100644
--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
@@ -167,6 +167,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_log(avctx, AV_LOG_ERROR,
"Invalid combination -slices %d and -max_nal_size %d.\n",
avctx->slices, s->max_nal_size);
+ err = AVERROR(EINVAL);
goto fail;
}
@@ -195,6 +196,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
} else {
av_log(avctx, AV_LOG_ERROR, "Invalid -max_nal_size, "
"specify a valid max_nal_size to use -slice_mode dyn\n");
+ err = AVERROR(EINVAL);
goto fail;
}
}
--
GitLab