Skip to content

media-playback: Fix possible crash on startup #12094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RytoEX merged 1 commit into from
May 6, 2025
Merged

media-playback: Fix possible crash on startup #12094

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions shared/media-playback/media-playback/media.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,12 +382,6 @@ void mp_media_next_video(mp_media_t *m, bool preload)
enum video_range_type new_range;
AVFrame *f = d->frame;

if (!f->width || !f->height) {
blog(LOG_ERROR, "MP: media frame width or height are zero ('%s': %" PRIu32 "x%" PRIu32 ")", m->path,
f->width, f->height);
return;
}

if (!preload) {
if (!mp_media_can_play_frame(m, d))
return;
Expand All @@ -400,6 +394,12 @@ void mp_media_next_video(mp_media_t *m, bool preload)
return;
}

if (!f->width || !f->height) {
blog(LOG_ERROR, "MP: media frame width or height are zero ('%s': %" PRIu32 "x%" PRIu32 ")", m->path,
f->width, f->height);
return;
}

bool flip = false;
if (m->swscale) {
int ret = sws_scale(m->swscale, (const uint8_t *const *)f->data, f->linesize, 0, f->height,
Expand Down
Loading