[3/4] libopenh264enc: Return a more sensible error code in some init failure paths

Message ID 1468525196-59168-3-git-send-email-martin@martin.st
State Committed
Commit 2d097c16b833c532ac974a7f1fd05c0a1f3b7675
Headers show

Commit Message

Martin Storsjö July 14, 2016, 7:39 p.m.
Previously they returned the default AVERROR_UNKNOWN.
---
 libavcodec/libopenh264enc.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Luca Barbato July 14, 2016, 7:53 p.m. | #1
On 14/07/16 21:39, Martin Storsjö wrote:
> Previously they returned the default AVERROR_UNKNOWN.
> ---
>  libavcodec/libopenh264enc.c | 2 ++
>  1 file changed, 2 insertions(+)

Ok.

Patch

diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index 8ef23f1..bf1cf25 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;
         }
     }