Skip to content
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

Jump to bottom

Fix segfault when reading mp4 files #1078

Closed
wants to merge 20 commits into from
Closed

Fix segfault when reading mp4 files #1078

Changes from 9 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9a4d9bd
Fix segfault when reading mp4 files (#1076)
OxygenCobalt Apr 18, 2021
2d313cb
Possibly fix compilation bug with clang (#1078)
OxygenCobalt Apr 18, 2021
6b1eba1
Add return statement to MP4Read call
OxygenCobalt Apr 18, 2021
10cd855
Merge branch 'cmus:master' into mp4-no-segfault
OxygenCobalt Jun 24, 2021
22d3020
mp4: try to fix libmp4v2 compilation on mac
OxygenCobalt Jun 25, 2021
0f01685
mp4: actually close ifdef
OxygenCobalt Jun 25, 2021
0b6fcd8
mp4: cleanup fix
OxygenCobalt Jun 25, 2021
0860527
mp4: revert previous macos fix
OxygenCobalt Jun 25, 2021
01fdc8a
Revert "mp4: revert previous macos fix"
OxygenCobalt Jun 25, 2021
976bef2
Change API ifdef
OxygenCobalt Oct 6, 2021
968c4bd
mp4: update comments around fix
OxygenCobalt Oct 6, 2021
2d8388a
Merge branch 'cmus:master' into mp4-no-segfault
OxygenCobalt Jan 7, 2022
8af2dca
mp4: move techsmith fork detection to configure
OxygenCobalt Jan 8, 2022
9322aa9
fix linking
OxygenCobalt Jan 8, 2022
14a7563
desperate ci fix 1
OxygenCobalt Jan 8, 2022
9257528
desperate ci fix 2
OxygenCobalt Jan 8, 2022
afca9d4
desperate ci fix 3
OxygenCobalt Jan 8, 2022
d449020
desperate ci fix 4
OxygenCobalt Jan 8, 2022
d62cb49
desperate ci fix 5
OxygenCobalt Jan 8, 2022
5e64100
desperate ci fix 6
OxygenCobalt Jan 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions ip/mp4.c
View file
Open in desktop
Expand Up @@ -171,11 +171,13 @@ static int mp4_open(struct input_plugin_data *ip_data)
NeAACDecSetConfiguration(priv->decoder, neaac_cfg);

/* open mpeg-4 file */
#ifdef MP4_DETAILS_ALL
priv->mp4.handle = MP4Read(ip_data->filename, 0);
#else
#ifdef __APPLE__
OxygenCobalt marked this conversation as resolved.
Show resolved Hide resolved
/* MP4Read doesnt have a second argument on macos */
priv->mp4.handle = MP4Read(ip_data->filename);
#else
priv->mp4.handle = MP4Read(ip_data->filename, NULL);
#endif

if (!priv->mp4.handle) {
d_print("MP4Read failed\n");
goto out;
Expand Down