Skip to content

obs-ffmpeg: Fix muxing non-AAC codecs / Opus in MP4 #8496

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

Merged
derrod merged 2 commits into from
Mar 20, 2023
Merged

obs-ffmpeg: Fix muxing non-AAC codecs / Opus in MP4 #8496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b62445
ffmpeg-mux: Set experimental compliance for FFmpeg < 6.0
derrod Mar 15, 2023
fae688b
obs-ffmpeg: Pass correct audio codec to muxer subprocess
derrod Mar 15, 2023
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
5 changes: 5 additions & 0 deletions plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,11 @@ static int ffmpeg_mux_init_context(struct ffmpeg_mux *ffm)
ffm->output->oformat->audio_codec = AV_CODEC_ID_NONE;
#endif

#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(60, 0, 100)
/* Allow FLAC/OPUS in MP4 */
ffm->output->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
#endif

if (!init_streams(ffm)) {
free_avformat(ffm);
return FFM_ERROR;
Expand Down
4 changes: 3 additions & 1 deletion plugins/obs-ffmpeg/obs-ffmpeg-mux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,9 @@ static void build_command_line(struct ffmpeg_muxer *stream, struct dstr *cmd,
add_video_encoder_params(stream, cmd, vencoder);

if (num_tracks) {
dstr_cat(cmd, "aac ");
const char *codec = obs_encoder_get_codec(aencoders[0]);
dstr_cat(cmd, codec);
dstr_cat(cmd, " ");

for (int i = 0; i < num_tracks; i++) {
add_audio_encoder_params(cmd, aencoders[i]);
Expand Down