Skip to content

Commit

Permalink
Call gfxoutput_init_ffmpegexe() after gfxoutput_init_ffmpeg() instead…
Browse files Browse the repository at this point in the history
… of before.

The former uses ffmpegdrv_formatlist which is initialized by the latter,
so if both are present, the latter one needs to be called first.


git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45383 379a1393-f5fb-40a0-bcee-ef074d9b53f7
  • Loading branch information
Rhialto committed Nov 29, 2024
1 parent 8759211 commit bca054b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions vice/src/gfxoutputdrv/ffmpegexedrv.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@

/* #define DEBUG_FFMPEG */
/* #define DEBUG_FFMPEG_FRAMES */
#define DEBUG_FFMPEG
#define DEBUG_FFMPEG_FRAMES

#include "vice.h"

Expand Down Expand Up @@ -1307,6 +1309,7 @@ static int ffmpegexedrv_record(screenshot_t *screenshot)
}

/*DBGFRAMES(("ffmpegexedrv_record (%u)", framecounter));*/
DBGFRAMES(("ffmpegexedrv_record (%u)", framecounter));
video_fill_rgb_image(screenshot, video_st_frame);

if (write_video_frame(video_st_frame) < 0) {
Expand Down
2 changes: 1 addition & 1 deletion vice/src/gfxoutputdrv/gfxoutput.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ int gfxoutput_early_init(int help)

/* video related */
gfxoutput_init_zmbv(help);
gfxoutput_init_ffmpegexe(help);
#ifdef HAVE_FFMPEG
gfxoutput_init_ffmpeg(help);
#endif
gfxoutput_init_ffmpegexe(help);

/* C64 formats */
gfxoutput_init_godot(help);
Expand Down

0 comments on commit bca054b

Please sign in to comment.