Commit 7e9474ca authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit '2d097c16'

* commit '2d097c16':
  libopenh264enc: Return a more sensible error code in some init failure paths
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 0bd76401 2d097c16
...@@ -167,6 +167,7 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -167,6 +167,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Invalid combination -slices %d and -max_nal_size %d.\n", "Invalid combination -slices %d and -max_nal_size %d.\n",
avctx->slices, s->max_nal_size); avctx->slices, s->max_nal_size);
err = AVERROR(EINVAL);
goto fail; goto fail;
} }
...@@ -195,6 +196,7 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -195,6 +196,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
} else { } else {
av_log(avctx, AV_LOG_ERROR, "Invalid -max_nal_size, " av_log(avctx, AV_LOG_ERROR, "Invalid -max_nal_size, "
"specify a valid max_nal_size to use -slice_mode dyn\n"); "specify a valid max_nal_size to use -slice_mode dyn\n");
err = AVERROR(EINVAL);
goto fail; goto fail;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment