all repos — mgba @ d6def0d407ac6d5440cd6b2ebc1a16c14054c824

mGBA Game Boy Advance Emulator

Video: Ensure FFmpeg encoder has audio frames
Jeffrey Pfau jeffrey@endrift.com
Tue, 23 Dec 2014 23:13:52 -0800
commit

d6def0d407ac6d5440cd6b2ebc1a16c14054c824

parent

55df6ce26b86a0065926b24ef7942f53734d2c2d

2 files changed, 4 insertions(+), 0 deletions(-)

jump to
M CHANGESCHANGES

@@ -25,6 +25,7 @@ - Qt: Properly set default video recording settings

- GBA Audio: Make larger buffer sizes than 2048 actually work properly - GBA Audio: Audio buffer sizes are now correct sizes for both sample rates - GBA Video: Fix blend issues with obscured middle layers + - Video: Ensure FFmpeg encoder has audio frames Misc: - Qt: Disable sync to video by default - GBA: Exit cleanly on FATAL if the port supports it
M src/platform/ffmpeg/ffmpeg-encoder.csrc/platform/ffmpeg/ffmpeg-encoder.c

@@ -225,6 +225,9 @@ encoder->audioFrame = av_frame_alloc();

#else encoder->audioFrame = avcodec_alloc_frame(); #endif + if (!encoder->audio->frame_size) { + encoder->audio->frame_size = 1024; + } encoder->audioFrame->nb_samples = encoder->audio->frame_size; encoder->audioFrame->format = encoder->audio->sample_fmt; encoder->audioFrame->pts = 0;