examples/*.c: fix incorrect die_codec() usage `die_codec()` should only be used with an initialized codec context. When reporting errors with `aom_codec_enc_config_default()`, `die()` should be used instead. This fixes a potential crash on failure. Change-Id: Id1c42012dbd4c929886372e723c36ee042aad368
diff --git a/examples/lightfield_encoder.c b/examples/lightfield_encoder.c index 63d72d4..dc8e890 100644 --- a/examples/lightfield_encoder.c +++ b/examples/lightfield_encoder.c
@@ -434,7 +434,6 @@ // lf_blocksize X lf_blocksize images will all use the reference image // in the middle of the block of images. int lf_blocksize; - aom_codec_ctx_t codec; aom_codec_enc_cfg_t cfg; aom_image_t raw; aom_image_t raw_shift; @@ -485,7 +484,8 @@ // Configuration res = aom_codec_enc_config_default(encoder, &cfg, 0); - if (res) die_codec(&codec, "Failed to get default codec config."); + if (res) + die("Failed to get default codec config: %s", aom_codec_err_to_string(res)); cfg.g_w = w; cfg.g_h = h;
diff --git a/examples/lossless_encoder.c b/examples/lossless_encoder.c index 194c717..c3d3b93 100644 --- a/examples/lossless_encoder.c +++ b/examples/lossless_encoder.c
@@ -96,7 +96,8 @@ aom_codec_ctx_t codec; res = aom_codec_enc_config_default(encoder, &cfg, 0); - if (res) die_codec(&codec, "Failed to get default codec config."); + if (res) + die("Failed to get default codec config: %s", aom_codec_err_to_string(res)); cfg.g_w = info.frame_width; cfg.g_h = info.frame_height;
diff --git a/examples/low_complexity_mode_encoder.c b/examples/low_complexity_mode_encoder.c index c80326f..902a9e8 100644 --- a/examples/low_complexity_mode_encoder.c +++ b/examples/low_complexity_mode_encoder.c
@@ -126,7 +126,8 @@ printf("Using %s\n", aom_codec_iface_name(encoder)); res = aom_codec_enc_config_default(encoder, &cfg, usage); - if (res) die_codec(&codec, "Failed to get default codec config."); + if (res) + die("Failed to get default codec config: %s", aom_codec_err_to_string(res)); cfg.g_w = info.frame_width; cfg.g_h = info.frame_height;
diff --git a/examples/scalable_encoder.c b/examples/scalable_encoder.c index 91d35a2..963b4c3 100644 --- a/examples/scalable_encoder.c +++ b/examples/scalable_encoder.c
@@ -186,7 +186,8 @@ aom_codec_ctx_t codec; res = aom_codec_enc_config_default(encoder, &cfg, 0); - if (res) die_codec(&codec, "Failed to get default codec config."); + if (res) + die("Failed to get default codec config: %s", aom_codec_err_to_string(res)); cfg.g_w = info.frame_width; cfg.g_h = info.frame_height;
diff --git a/examples/set_maps.c b/examples/set_maps.c index 4f41b47..0d03983 100644 --- a/examples/set_maps.c +++ b/examples/set_maps.c
@@ -167,7 +167,8 @@ printf("Using %s\n", aom_codec_iface_name(encoder)); res = aom_codec_enc_config_default(encoder, &cfg, usage); - if (res) die_codec(&codec, "Failed to get default codec config."); + if (res) + die("Failed to get default codec config: %s", aom_codec_err_to_string(res)); cfg.g_w = info.frame_width; cfg.g_h = info.frame_height;
diff --git a/examples/simple_encoder.c b/examples/simple_encoder.c index b08f97b..f5ddb3b 100644 --- a/examples/simple_encoder.c +++ b/examples/simple_encoder.c
@@ -212,7 +212,8 @@ printf("Using %s\n", aom_codec_iface_name(encoder)); res = aom_codec_enc_config_default(encoder, &cfg, usage); - if (res) die_codec(&codec, "Failed to get default codec config."); + if (res) + die("Failed to get default codec config: %s", aom_codec_err_to_string(res)); cfg.g_w = info.frame_width; cfg.g_h = info.frame_height;
diff --git a/examples/twopass_encoder.c b/examples/twopass_encoder.c index 4d7c653..285bef2 100644 --- a/examples/twopass_encoder.c +++ b/examples/twopass_encoder.c
@@ -187,7 +187,6 @@ int main(int argc, char **argv) { FILE *infile = NULL; int w, h; - aom_codec_ctx_t codec; aom_codec_enc_cfg_t cfg; aom_image_t raw; aom_codec_err_t res; @@ -225,7 +224,8 @@ // Configuration res = aom_codec_enc_config_default(encoder, &cfg, 0); - if (res) die_codec(&codec, "Failed to get default codec config."); + if (res) + die("Failed to get default codec config: %s", aom_codec_err_to_string(res)); cfg.g_w = w; cfg.g_h = h;