diff options
author | Niklas Haas <git@haasn.dev> | 2021-11-03 15:15:20 +0100 |
---|---|---|
committer | Niklas Haas <git@haasn.dev> | 2021-11-03 15:15:20 +0100 |
commit | 8bd0dee531e3dfbc076bc06ab9c2ea0e3b4e2419 (patch) | |
tree | 711a7721171eec477016a9d7fcfb892376b72371 /video | |
parent | 701bd783cafa9fbe6dc5c34d8784193179a9290d (diff) | |
download | mpv-8bd0dee531e3dfbc076bc06ab9c2ea0e3b4e2419.tar.bz2 mpv-8bd0dee531e3dfbc076bc06ab9c2ea0e3b4e2419.tar.xz |
osdep: rename MP_UNREACHABLE
It was pointed out on IRC that the name is misleading, since the actual
semantics of the macro is to assert first.
Diffstat (limited to 'video')
-rw-r--r-- | video/mp_image.c | 2 | ||||
-rw-r--r-- | video/out/gpu/video.c | 2 | ||||
-rw-r--r-- | video/out/placebo/utils.c | 14 | ||||
-rw-r--r-- | video/repack.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/video/mp_image.c b/video/mp_image.c index e8d433cbfe..484108c315 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -593,7 +593,7 @@ static bool endian_swap_bytes(void *d, size_t bytes, size_t word_size) AV_WL32(ud + x * 2, AV_RB32(ud + x * 2)); break; default: - MP_UNREACHABLE(); + MP_ASSERT_UNREACHABLE(); } return true; diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c index 43fff511a1..add7985f78 100644 --- a/video/out/gpu/video.c +++ b/video/out/gpu/video.c @@ -4237,7 +4237,7 @@ static void gl_video_dr_free_buffer(void *opaque, uint8_t *data) } } // not found - must not happen - MP_UNREACHABLE(); + MP_ASSERT_UNREACHABLE(); } struct mp_image *gl_video_get_image(struct gl_video *p, int imgfmt, int w, int h, diff --git a/video/out/placebo/utils.c b/video/out/placebo/utils.c index a4bd829880..f677c20335 100644 --- a/video/out/placebo/utils.c +++ b/video/out/placebo/utils.c @@ -79,7 +79,7 @@ enum pl_color_primaries mp_prim_to_pl(enum mp_csp_prim prim) case MP_CSP_PRIM_COUNT: return PL_COLOR_PRIM_COUNT; } - MP_UNREACHABLE(); + MP_ASSERT_UNREACHABLE(); } enum pl_color_transfer mp_trc_to_pl(enum mp_csp_trc trc) @@ -104,7 +104,7 @@ enum pl_color_transfer mp_trc_to_pl(enum mp_csp_trc trc) case MP_CSP_TRC_COUNT: return PL_COLOR_TRC_COUNT; } - MP_UNREACHABLE(); + MP_ASSERT_UNREACHABLE(); } enum pl_color_light mp_light_to_pl(enum mp_csp_light light) @@ -118,7 +118,7 @@ enum pl_color_light mp_light_to_pl(enum mp_csp_light light) case MP_CSP_LIGHT_COUNT: return PL_COLOR_LIGHT_COUNT; } - MP_UNREACHABLE(); + MP_ASSERT_UNREACHABLE(); } enum pl_color_system mp_csp_to_pl(enum mp_csp csp) @@ -136,7 +136,7 @@ enum pl_color_system mp_csp_to_pl(enum mp_csp csp) case MP_CSP_COUNT: return PL_COLOR_SYSTEM_COUNT; } - MP_UNREACHABLE(); + MP_ASSERT_UNREACHABLE(); } enum pl_color_levels mp_levels_to_pl(enum mp_csp_levels levels) @@ -148,7 +148,7 @@ enum pl_color_levels mp_levels_to_pl(enum mp_csp_levels levels) case MP_CSP_LEVELS_COUNT: return PL_COLOR_LEVELS_COUNT; } - MP_UNREACHABLE(); + MP_ASSERT_UNREACHABLE(); } enum pl_alpha_mode mp_alpha_to_pl(enum mp_alpha_type alpha) @@ -161,7 +161,7 @@ enum pl_alpha_mode mp_alpha_to_pl(enum mp_alpha_type alpha) case MP_ALPHA_PREMUL: return PL_ALPHA_PREMULTIPLIED; } - MP_UNREACHABLE(); + MP_ASSERT_UNREACHABLE(); } enum pl_chroma_location mp_chroma_to_pl(enum mp_chroma_location chroma) @@ -174,5 +174,5 @@ enum pl_chroma_location mp_chroma_to_pl(enum mp_chroma_location chroma) case MP_CHROMA_COUNT: return PL_CHROMA_COUNT; } - MP_UNREACHABLE(); + MP_ASSERT_UNREACHABLE(); } diff --git a/video/repack.c b/video/repack.c index 7973208caf..d50f642cb1 100644 --- a/video/repack.c +++ b/video/repack.c @@ -169,7 +169,7 @@ static void swap_endian(struct mp_image *dst, int dst_x, int dst_y, ((uint32_t *)d)[x] = av_bswap32(((uint32_t *)s)[x]); break; default: - MP_UNREACHABLE(); + MP_ASSERT_UNREACHABLE(); } } } |