jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2289 from jpark37/ffmpeg-warnings 

obs-ffmpeg: Fix VC++ warnings
master
Jim 2020-01-03 12:10:52 -08:00 committed by GitHub
parent a49284df63 55d47bed0d
commit 61940e50e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/obs-ffmpeg/ffmpeg-encoded-output.c
View File

@ -502,10 +502,10 @@ static int get_audio_mix_count(int audio_mix_mask)
return mix_count;
}
static inline double encoder_bitrate(obs_encoder_t *encoder)
static inline int encoder_bitrate(obs_encoder_t *encoder)
{
obs_data_t *settings = obs_encoder_get_settings(encoder);
double bitrate = obs_data_get_double(settings, "bitrate");
const int bitrate = (int)obs_data_get_int(settings, "bitrate");
obs_data_release(settings);
@ -542,7 +542,7 @@ static int proto_try_connect(struct ffmpeg_encoded_output *stream)
config.scale_height = 0;
config.width = obs_encoder_get_width(vencoder);
config.height = obs_encoder_get_height(vencoder);
config.audio_tracks = audio_output_get_channels(audio);
config.audio_tracks = (int)audio_output_get_channels(audio);
config.audio_mix_count = get_audio_mix_count(config.audio_tracks);
config.format =
obs_to_ffmpeg_video_format(video_output_get_format(video));

4
plugins/obs-ffmpeg/obs-ffmpeg-output.c
View File

@ -219,7 +219,7 @@ static bool create_video_stream(struct ffmpeg_data *data)
data->vcodec->pix_fmts, data->config.format, 0, NULL);
context = data->video->codec;
context->bit_rate = data->config.video_bitrate * 1000;
context->bit_rate = (int64_t)data->config.video_bitrate * 1000;
context->width = data->config.scale_width;
context->height = data->config.scale_height;
context->time_base = (AVRational){ovi.fps_den, ovi.fps_num};
@ -313,7 +313,7 @@ static bool create_audio_stream(struct ffmpeg_data *data, int idx)
data->audio_streams[idx] = stream;
context = data->audio_streams[idx]->codec;
context->bit_rate = data->config.audio_bitrate * 1000;
context->bit_rate = (int64_t)data->config.audio_bitrate * 1000;
context->time_base = (AVRational){1, aoi.samples_per_sec};
context->channels = get_audio_channels(aoi.speakers);
context->sample_rate = aoi.samples_per_sec;