diff options
Diffstat (limited to 'demux/ebml.c')
| -rw-r--r-- | demux/ebml.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/demux/ebml.c b/demux/ebml.c index 477e335a2f..7f62f1ff90 100644 --- a/demux/ebml.c +++ b/demux/ebml.c @@ -20,8 +20,6 @@ * License along with mpv. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdbool.h> #include <inttypes.h> @@ -224,7 +222,7 @@ int ebml_resync_cluster(struct mp_log *log, stream_t *s) #define E_S(str, count) EVALARGS(E_SN, str, count, N) #define FN(id, name, multiple, N) { id, multiple, offsetof(struct ebml_ ## N, name), offsetof(struct ebml_ ## N, n_ ## name), &ebml_##name##_desc}, #define F(id, name, multiple) EVALARGS(FN, id, name, multiple, N) -#include "generated/ebml_defs.c" +#include "ebml_defs.inc" #undef EVALARGS #undef SN #undef S @@ -429,7 +427,7 @@ static void ebml_parse_element(struct ebml_parse_ctx *ctx, void *target, uint32_t, num_elems[i]); break; default: - abort(); + MP_ASSERT_UNREACHABLE(); } } } @@ -582,7 +580,7 @@ static void ebml_parse_element(struct ebml_parse_ctx *ctx, void *target, MP_TRACE(ctx, "ebml_id %x\n", (unsigned)*idptr); break; default: - abort(); + MP_ASSERT_UNREACHABLE(); } *countptr += 1; error: |