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

Ad -F+i option to allow setting ffmpeg options that apply to input only. #8397

Merged
merged 5 commits into from
Mar 8, 2024
Merged

Ad -F+i option to allow setting ffmpeg options that apply to input only. #8397

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c4deac
Ad -F+i option to allow setting ffmpeg options that apply to input only.
joa-quim Mar 6, 2024
07aa0aa
Forgot to apply the -F+i contents.
joa-quim Mar 6, 2024
67f0b39
Fotgot to add 'i' to the process modifier function.
joa-quim Mar 8, 2024
0923f4f
Add description in the docs
Esteban82 Mar 8, 2024
e51a736
Document the new -F+i<opts> modifier.
joa-quim Mar 8, 2024
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
Prev Previous commit
Next Next commit
Forgot to apply the -F+i contents.
  • Loading branch information
@joa-quim
joa-quim committed Mar 6, 2024
commit 07aa0aae1a47f7af128f473800046d8628b42dc8
8 changes: 4 additions & 4 deletions src/movie.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2729,8 +2729,8 @@ EXTERN_MSC int GMT_movie (void *V_API, int mode, void *args) {
else
sprintf (extra, "quiet");
sprintf (png_file, "%%0%dd", precision);
sprintf (cmd, "ffmpeg -loglevel %s -f image2 -framerate %g -y -i \"%s%c%s_%s.%s\"%s -vcodec libx264 %s -pix_fmt yuv420p %s.mp4",
extra, Ctrl->D.framerate, tmpwpath, dir_sep, Ctrl->N.prefix, png_file, MOVIE_RASTER_EXTENSION, audio_option,
sprintf (cmd, "ffmpeg %s -loglevel %s -f image2 -framerate %g -y -i \"%s%c%s_%s.%s\"%s -vcodec libx264 %s -pix_fmt yuv420p %s.mp4",
(Ctrl->F.i_options[MOVIE_MP4]) ? Ctrl->F.i_options[MOVIE_MP4] : "", extra, Ctrl->D.framerate, tmpwpath, dir_sep, Ctrl->N.prefix, png_file, MOVIE_RASTER_EXTENSION, audio_option,
(Ctrl->F.options[MOVIE_MP4]) ? Ctrl->F.options[MOVIE_MP4] : "", Ctrl->N.prefix);
gmt_sleep (MOVIE_PAUSE_A_SEC); /* Wait 1 second to ensure all files are synced before building the movie */
GMT_Report (API, GMT_MSG_NOTICE, "Running: %s\n", cmd);
Expand Down Expand Up @@ -2762,8 +2762,8 @@ EXTERN_MSC int GMT_movie (void *V_API, int mode, void *args) {
else
sprintf (extra, "quiet");
sprintf (png_file, "%%0%dd", precision);
sprintf (cmd, "ffmpeg -loglevel %s -f image2 -framerate %g -y -i \"%s%c%s_%s.%s\"%s -vcodec %s %s -pix_fmt %s %s.webm",
extra, Ctrl->D.framerate, tmpwpath, dir_sep, Ctrl->N.prefix, png_file, MOVIE_RASTER_EXTENSION, audio_option, vpx[Ctrl->F.transparent],
sprintf (cmd, "ffmpeg %s -loglevel %s -f image2 -framerate %g -y -i \"%s%c%s_%s.%s\"%s -vcodec %s %s -pix_fmt %s %s.webm",
(Ctrl->F.i_options[MOVIE_MP4]) ? Ctrl->F.i_options[MOVIE_MP4] : "", extra, Ctrl->D.framerate, tmpwpath, dir_sep, Ctrl->N.prefix, png_file, MOVIE_RASTER_EXTENSION, audio_option, vpx[Ctrl->F.transparent],
(Ctrl->F.options[MOVIE_WEBM]) ? Ctrl->F.options[MOVIE_WEBM] : "", pix_fmt[Ctrl->F.transparent], Ctrl->N.prefix);
gmt_sleep (MOVIE_PAUSE_A_SEC); /* Wait 1 second to ensure all files are synced before building the movie */
GMT_Report (API, GMT_MSG_NOTICE, "Running: %s\n", cmd);
Expand Down
Loading