various: replace if + abort() with MP_HANDLE_OOM()

MP_HANDLE_OOM also aborts but calls assert() first, which
will result in an useful message if compiled in debug mode.

2 files changed, 2 insertions, 4 deletions

diff --git a/demux/demux.c b/demux/demux.c
index b6e85330ed..15ed27af73 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -2658,8 +2658,7 @@ static int dequeue_packet(struct demux_stream *ds, double min_pts,
             return -1;
         ds->attached_picture_added = true;
         struct demux_packet *pkt = demux_copy_packet(ds->sh->attached_picture);
-        if (!pkt)
-            abort();
+        MP_HANDLE_OOM(pkt);
         pkt->stream = ds->sh->index;
         *res = pkt;
         return 1;
diff --git a/demux/demux_raw.c b/demux/demux_raw.c
index edc89e7418..4884b78b37 100644
--- a/demux/demux_raw.c
+++ b/demux/demux_raw.c
@@ -247,8 +247,7 @@ static int demux_rawvideo_open(demuxer_t *demuxer, enum demux_check check)
     c->disp_h = height;
     if (mp_imgfmt) {
         c->lav_codecpar = avcodec_parameters_alloc();
-        if (!c->lav_codecpar)
-            abort();
+        MP_HANDLE_OOM(c->lav_codecpar);
         c->lav_codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
         c->lav_codecpar->codec_id = mp_codec_to_av_codec_id(decoder);
         c->lav_codecpar->format = imgfmt2pixfmt(mp_imgfmt);