Skip to content

ffmpeg: tolerate trailing CSV separator from side-data streams (iPhone .mov) #31

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

Open
siraustin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ffmpeg: tolerate trailing CSV separator from side-data streams (iPhone .mov) #31

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
20 changes: 14 additions & 6 deletions h3_ffmpeg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,20 @@ int h3_ffprobe_visual_size(const char *path, int *width, int *height,
path);
return 0;
}
for (char *cursor = output + consumed; *cursor; cursor++) {
if (*cursor != ' ' && *cursor != '\t' && *cursor != '\r' &&
*cursor != '\n') {
fail(error, error_size, "FFprobe returned an invalid visual size");
return 0;
}
/* FFprobe's compact/CSV writer (FFmpeg >= 5.1) emits one item
* separator before an unselected nested stream side_data_list —
* present in e.g. iPhone .mov files carrying a display matrix —
* yielding "3840x2160x". Accept exactly that one optional separator
* before trailing whitespace; anything else is still an error. */
char *cursor = output + consumed;
if (*cursor == 'x') cursor++;
while (*cursor == ' ' || *cursor == '\t' || *cursor == '\r' ||
*cursor == '\n') {
cursor++;
}
if (*cursor != '\0') {
fail(error, error_size, "FFprobe returned an invalid visual size");
return 0;
}
if (parsed_width < 1 || parsed_height < 1) {
fail(error, error_size, "visual stream has invalid dimensions %dx%d",
Expand Down