diff --git a/cores/libretro-ffmpeg/ffmpeg_core.c b/cores/libretro-ffmpeg/ffmpeg_core.c
index 8f183b82ac..fde29c4fbd 100644
--- a/cores/libretro-ffmpeg/ffmpeg_core.c
+++ b/cores/libretro-ffmpeg/ffmpeg_core.c
@@ -193,10 +193,9 @@ static GLint mix_loc;
 
 static struct
 {
+   double interpolate_fps;
    unsigned width;
    unsigned height;
-
-   double interpolate_fps;
    unsigned sample_rate;
 
    float aspect;
diff --git a/cores/libretro-ffmpeg/video_buffer.c b/cores/libretro-ffmpeg/video_buffer.c
index bc767f1150..1b580d3607 100644
--- a/cores/libretro-ffmpeg/video_buffer.c
+++ b/cores/libretro-ffmpeg/video_buffer.c
@@ -19,14 +19,14 @@ enum kbStatus
 
 struct video_buffer
 {
+   int64_t head;
+   int64_t tail;
    video_decoder_context_t *buffer;
    enum kbStatus *status;
-   size_t capacity;
    slock_t *lock;
    scond_t *open_cond;
    scond_t *finished_cond;
-   int64_t head;
-   int64_t tail;
+   size_t capacity;
 };
 
 video_buffer_t *video_buffer_create(
diff --git a/cores/libretro-ffmpeg/video_buffer.h b/cores/libretro-ffmpeg/video_buffer.h
index 179f7bc2b9..9f44f5f7f2 100644
--- a/cores/libretro-ffmpeg/video_buffer.h
+++ b/cores/libretro-ffmpeg/video_buffer.h
@@ -43,7 +43,6 @@ RETRO_BEGIN_DECLS
  */
 struct video_decoder_context
 {
-   int index;
    int64_t pts;
    struct SwsContext *sws;
    AVFrame *source;
@@ -55,6 +54,7 @@ struct video_decoder_context
    ASS_Track *ass_track_active;
 #endif
    uint8_t *frame_buf;
+   int index;
 };
 typedef struct video_decoder_context video_decoder_context_t;