diff -Nru obs-studio-0.11.0.1/debian/changelog obs-studio-0.11.1/debian/changelog --- obs-studio-0.11.0.1/debian/changelog 2015-07-09 20:13:24.000000000 +0000 +++ obs-studio-0.11.1/debian/changelog 2015-07-09 20:13:25.000000000 +0000 @@ -1,13 +1,19 @@ -obs-studio (0.11.0.1-191~utopic) utopic; urgency=low +obs-studio (0.11.1-197~utopic) utopic; urgency=low - OBS Multiplatform 0.11.0 + OBS Multiplatform 0.11.1 - General Changes: + 0.11.1 Hotfix: + * Fixed a bug where adding an audio filter to a source that had both video and audio would cause the video to stop playing from that source + * Fixed a bug where the microsoft AAC encoder wouldn't encoder properly with 48khz + * Fixed a bug where scene collections would not properly save the previous scene collection before switching + * Fixed a bug where scene collections would not properly update the scene collection menu after creating new scene collections + + 0.11.0 General Changes: * Added profile support (currently just via a menu option) to allow you to save and change to different settings profiles * Added scene collections (note that scene collections are fully functional even while streaming/recording) - * Added the ability to select the type of container format to save recordings to in output settings (mp4, mov, ts, mkv, flv). If the program unexpectedly terminates while recording, the recording file won't be corrupted. (Corruption can still occur if the entire computer is shut down/restarted while recording however) + * Added the ability to select the type of container format to save recordings to in output settings (mp4, mov, ts, mkv, flv). If the program unexpectedly terminates while recording, the recording file won't be corrupted. (Corruption can still occur if the entire computer is shut down/restarted while recording however) * Added the ability to save multiple audio tracks with different mixer configurations on a single recording in advanced output settings (supported by mp4, mov, ts, mkv, but not flv) - * Added portable mode option, which allows the program to save and access configuration data from the program's base folder. You can enable portable mode by using the --portable or -p command line parameter, or by having the following file in the base program directory to enable it: portable_mode or portable_mode.txt + * Added portable mode option, which allows the program to save and access configuration data from the program's base folder. You can enable portable mode by using the --portable or -p command line parameter, or by having the following file in the base program directory to enable it: portable_mode or portable_mode.txt * Added support for Apple's CoreAudio encoder for better audio encoding quality (always available on mac, and should be available on windows if the user has itunes or quicktime) * Added a scroll effect filter (which had been highly requested for things like text) * Added a noise gate audio filter @@ -32,7 +38,7 @@ * Fixed a bug in the media source where remote streams wouldn't play back properly * Improved logging to look more clean and segmented, with better details - Windows Changes: + 0.11.0 Windows Changes: * Added support for Microsoft's AAC encoder on windows 8+, allowing for better audio encoding quality and reduced CPU usage * Added a button to optionally disable aero if on windows 7/vista to the video section * Added option to the video device source to allow outputting audio to desktop (via DirectSound or WaveOut) instead of capturing audio (Built-in audio monitoring of all sources coming in the future will replace this feature in the future) @@ -40,4 +46,4 @@ * Fixed a bug with game capture where you couldn't capture a game if the game was at a permission level lower than OBS * Fixed a bug where game capture could crash 64bit games - -- John Bradley Thu, 09 Jul 2015 07:04:23 +0000 + -- John Bradley Thu, 09 Jul 2015 20:17:47 +0000 diff -Nru obs-studio-0.11.0.1/.git/HEAD obs-studio-0.11.1/.git/HEAD --- obs-studio-0.11.0.1/.git/HEAD 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/.git/HEAD 2015-07-09 20:17:30.000000000 +0000 @@ -1 +1 @@ -231dfbd975c7c97999ae80abc11429cad0572455 +1efb8491be06606b322b69a63728789605049349 Binary files /tmp/pLoGHQ0xAx/obs-studio-0.11.0.1/.git/index and /tmp/SRhW1iXm7W/obs-studio-0.11.1/.git/index differ diff -Nru obs-studio-0.11.0.1/.git/logs/HEAD obs-studio-0.11.1/.git/logs/HEAD --- obs-studio-0.11.0.1/.git/logs/HEAD 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/.git/logs/HEAD 2015-07-09 20:17:30.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 231dfbd975c7c97999ae80abc11429cad0572455 Ubuntu 1436425448 +0000 clone: from https://github.com/jp9000/obs-studio.git -231dfbd975c7c97999ae80abc11429cad0572455 231dfbd975c7c97999ae80abc11429cad0572455 Ubuntu 1436425448 +0000 checkout: moving from master to 0.11.0 +0000000000000000000000000000000000000000 1efb8491be06606b322b69a63728789605049349 Ubuntu 1436473050 +0000 clone: from https://github.com/jp9000/obs-studio.git +1efb8491be06606b322b69a63728789605049349 1efb8491be06606b322b69a63728789605049349 Ubuntu 1436473050 +0000 checkout: moving from master to 0.11.1 diff -Nru obs-studio-0.11.0.1/.git/logs/refs/heads/master obs-studio-0.11.1/.git/logs/refs/heads/master --- obs-studio-0.11.0.1/.git/logs/refs/heads/master 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/.git/logs/refs/heads/master 2015-07-09 20:17:30.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 231dfbd975c7c97999ae80abc11429cad0572455 Ubuntu 1436425448 +0000 clone: from https://github.com/jp9000/obs-studio.git +0000000000000000000000000000000000000000 1efb8491be06606b322b69a63728789605049349 Ubuntu 1436473050 +0000 clone: from https://github.com/jp9000/obs-studio.git diff -Nru obs-studio-0.11.0.1/.git/logs/refs/remotes/origin/HEAD obs-studio-0.11.1/.git/logs/refs/remotes/origin/HEAD --- obs-studio-0.11.0.1/.git/logs/refs/remotes/origin/HEAD 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/.git/logs/refs/remotes/origin/HEAD 2015-07-09 20:17:30.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 231dfbd975c7c97999ae80abc11429cad0572455 Ubuntu 1436425448 +0000 clone: from https://github.com/jp9000/obs-studio.git +0000000000000000000000000000000000000000 1efb8491be06606b322b69a63728789605049349 Ubuntu 1436473050 +0000 clone: from https://github.com/jp9000/obs-studio.git Binary files /tmp/pLoGHQ0xAx/obs-studio-0.11.0.1/.git/modules/plugins/mac-syphon/syphon-framework/index and /tmp/SRhW1iXm7W/obs-studio-0.11.1/.git/modules/plugins/mac-syphon/syphon-framework/index differ diff -Nru obs-studio-0.11.0.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/HEAD obs-studio-0.11.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/HEAD --- obs-studio-0.11.0.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/HEAD 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/HEAD 2015-07-09 20:17:31.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 01b144811f6f7080b70b2d7cc729da071f86f9d7 Ubuntu 1436425448 +0000 clone: from https://github.com/palana/Syphon-Framework.git -01b144811f6f7080b70b2d7cc729da071f86f9d7 01b144811f6f7080b70b2d7cc729da071f86f9d7 Ubuntu 1436425448 +0000 checkout: moving from master to 01b144811f6f7080b70b2d7cc729da071f86f9d7 +0000000000000000000000000000000000000000 01b144811f6f7080b70b2d7cc729da071f86f9d7 Ubuntu 1436473051 +0000 clone: from https://github.com/palana/Syphon-Framework.git +01b144811f6f7080b70b2d7cc729da071f86f9d7 01b144811f6f7080b70b2d7cc729da071f86f9d7 Ubuntu 1436473051 +0000 checkout: moving from master to 01b144811f6f7080b70b2d7cc729da071f86f9d7 diff -Nru obs-studio-0.11.0.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/refs/heads/master obs-studio-0.11.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/refs/heads/master --- obs-studio-0.11.0.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/refs/heads/master 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/refs/heads/master 2015-07-09 20:17:31.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 01b144811f6f7080b70b2d7cc729da071f86f9d7 Ubuntu 1436425448 +0000 clone: from https://github.com/palana/Syphon-Framework.git +0000000000000000000000000000000000000000 01b144811f6f7080b70b2d7cc729da071f86f9d7 Ubuntu 1436473051 +0000 clone: from https://github.com/palana/Syphon-Framework.git diff -Nru obs-studio-0.11.0.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/refs/remotes/origin/HEAD obs-studio-0.11.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/refs/remotes/origin/HEAD --- obs-studio-0.11.0.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/refs/remotes/origin/HEAD 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/.git/modules/plugins/mac-syphon/syphon-framework/logs/refs/remotes/origin/HEAD 2015-07-09 20:17:31.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 01b144811f6f7080b70b2d7cc729da071f86f9d7 Ubuntu 1436425448 +0000 clone: from https://github.com/palana/Syphon-Framework.git +0000000000000000000000000000000000000000 01b144811f6f7080b70b2d7cc729da071f86f9d7 Ubuntu 1436473051 +0000 clone: from https://github.com/palana/Syphon-Framework.git Binary files /tmp/pLoGHQ0xAx/obs-studio-0.11.0.1/.git/modules/plugins/win-dshow/libdshowcapture/index and /tmp/SRhW1iXm7W/obs-studio-0.11.1/.git/modules/plugins/win-dshow/libdshowcapture/index differ diff -Nru obs-studio-0.11.0.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/HEAD obs-studio-0.11.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/HEAD --- obs-studio-0.11.0.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/HEAD 2015-07-09 07:04:09.000000000 +0000 +++ obs-studio-0.11.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/HEAD 2015-07-09 20:17:31.000000000 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 0eae72efd404412951cee288bd8e40f7c7e829b6 Ubuntu 1436425449 +0000 clone: from https://github.com/jp9000/libdshowcapture.git -0eae72efd404412951cee288bd8e40f7c7e829b6 0eae72efd404412951cee288bd8e40f7c7e829b6 Ubuntu 1436425449 +0000 checkout: moving from master to 0eae72efd404412951cee288bd8e40f7c7e829b6 +0000000000000000000000000000000000000000 0eae72efd404412951cee288bd8e40f7c7e829b6 Ubuntu 1436473051 +0000 clone: from https://github.com/jp9000/libdshowcapture.git +0eae72efd404412951cee288bd8e40f7c7e829b6 0eae72efd404412951cee288bd8e40f7c7e829b6 Ubuntu 1436473051 +0000 checkout: moving from master to 0eae72efd404412951cee288bd8e40f7c7e829b6 diff -Nru obs-studio-0.11.0.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/refs/heads/master obs-studio-0.11.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/refs/heads/master --- obs-studio-0.11.0.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/refs/heads/master 2015-07-09 07:04:09.000000000 +0000 +++ obs-studio-0.11.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/refs/heads/master 2015-07-09 20:17:31.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 0eae72efd404412951cee288bd8e40f7c7e829b6 Ubuntu 1436425449 +0000 clone: from https://github.com/jp9000/libdshowcapture.git +0000000000000000000000000000000000000000 0eae72efd404412951cee288bd8e40f7c7e829b6 Ubuntu 1436473051 +0000 clone: from https://github.com/jp9000/libdshowcapture.git diff -Nru obs-studio-0.11.0.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/refs/remotes/origin/HEAD obs-studio-0.11.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/refs/remotes/origin/HEAD --- obs-studio-0.11.0.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/refs/remotes/origin/HEAD 2015-07-09 07:04:09.000000000 +0000 +++ obs-studio-0.11.1/.git/modules/plugins/win-dshow/libdshowcapture/logs/refs/remotes/origin/HEAD 2015-07-09 20:17:31.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 0eae72efd404412951cee288bd8e40f7c7e829b6 Ubuntu 1436425449 +0000 clone: from https://github.com/jp9000/libdshowcapture.git +0000000000000000000000000000000000000000 0eae72efd404412951cee288bd8e40f7c7e829b6 Ubuntu 1436473051 +0000 clone: from https://github.com/jp9000/libdshowcapture.git Binary files /tmp/pLoGHQ0xAx/obs-studio-0.11.0.1/.git/objects/pack/pack-95963ae0dd0a3badd4bad8954db658a9cc92bfd4.idx and /tmp/SRhW1iXm7W/obs-studio-0.11.1/.git/objects/pack/pack-95963ae0dd0a3badd4bad8954db658a9cc92bfd4.idx differ Binary files /tmp/pLoGHQ0xAx/obs-studio-0.11.0.1/.git/objects/pack/pack-95963ae0dd0a3badd4bad8954db658a9cc92bfd4.pack and /tmp/SRhW1iXm7W/obs-studio-0.11.1/.git/objects/pack/pack-95963ae0dd0a3badd4bad8954db658a9cc92bfd4.pack differ Binary files /tmp/pLoGHQ0xAx/obs-studio-0.11.0.1/.git/objects/pack/pack-f2b60c5164530808f5f30277ed518b94aa1b07d8.idx and /tmp/SRhW1iXm7W/obs-studio-0.11.1/.git/objects/pack/pack-f2b60c5164530808f5f30277ed518b94aa1b07d8.idx differ Binary files /tmp/pLoGHQ0xAx/obs-studio-0.11.0.1/.git/objects/pack/pack-f2b60c5164530808f5f30277ed518b94aa1b07d8.pack and /tmp/SRhW1iXm7W/obs-studio-0.11.1/.git/objects/pack/pack-f2b60c5164530808f5f30277ed518b94aa1b07d8.pack differ diff -Nru obs-studio-0.11.0.1/.git/packed-refs obs-studio-0.11.1/.git/packed-refs --- obs-studio-0.11.0.1/.git/packed-refs 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/.git/packed-refs 2015-07-09 20:17:30.000000000 +0000 @@ -1,13 +1,15 @@ # pack-refs with: peeled fully-peeled 9faa6469165e1b056262578bd9973e97d39ec10d refs/remotes/origin/deinterlace 791d13fdc97e323561f1fe6546bb6d672a9eb2b8 refs/remotes/origin/mac-cursor-fix -231dfbd975c7c97999ae80abc11429cad0572455 refs/remotes/origin/master +1efb8491be06606b322b69a63728789605049349 refs/remotes/origin/master 95c8d81bc9a1fe4962e0f2bb7ec7c5f93b20b44e refs/tags/0.10.0 ^782a5daa187e61f890bcde2987f2afd916a6a363 bd9629ddf6287177c6d7c310c9ad05eb3f8daa3e refs/tags/0.10.1 ^dcf7ac95879e0d73ba29dac7ebe9a3750b0663f4 b5a9660140985b6b9da9fcceb909456ff30d7607 refs/tags/0.11.0 ^231dfbd975c7c97999ae80abc11429cad0572455 +8e241a36fd60588881c47c86d900ea1b14c95995 refs/tags/0.11.1 +^1efb8491be06606b322b69a63728789605049349 3a850e67c36696ba84e77def0876ca444f5cfff3 refs/tags/0.2.4 7c8ef6f6efca06387705d6347cbd244f47db3f5e refs/tags/0.3.1 9cc1b4382077805cf8c6af4119cdbd4c1a90c1f4 refs/tags/0.4.0 diff -Nru obs-studio-0.11.0.1/.git/refs/heads/master obs-studio-0.11.1/.git/refs/heads/master --- obs-studio-0.11.0.1/.git/refs/heads/master 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/.git/refs/heads/master 2015-07-09 20:17:30.000000000 +0000 @@ -1 +1 @@ -231dfbd975c7c97999ae80abc11429cad0572455 +1efb8491be06606b322b69a63728789605049349 diff -Nru obs-studio-0.11.0.1/libobs/obs-config.h obs-studio-0.11.1/libobs/obs-config.h --- obs-studio-0.11.0.1/libobs/obs-config.h 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/libobs/obs-config.h 2015-07-09 20:17:30.000000000 +0000 @@ -41,7 +41,7 @@ * * Reset to zero each major or minor version */ -#define LIBOBS_API_PATCH_VER 0 +#define LIBOBS_API_PATCH_VER 1 #define MAKE_SEMANTIC_VERSION(major, minor, patch) \ ((major << 24) | \ diff -Nru obs-studio-0.11.0.1/libobs/obs-encoder.c obs-studio-0.11.1/libobs/obs-encoder.c --- obs-studio-0.11.0.1/libobs/obs-encoder.c 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/libobs/obs-encoder.c 2015-07-09 20:17:30.000000000 +0000 @@ -503,6 +503,17 @@ video_output_get_height(encoder->media); } +uint32_t obs_encoder_get_sample_rate(const obs_encoder_t *encoder) +{ + if (!encoder || !encoder->media || + encoder->info.type != OBS_ENCODER_AUDIO) + return 0; + + return encoder->samplerate != 0 ? + encoder->samplerate : + audio_output_get_sample_rate(encoder->media); +} + void obs_encoder_set_video(obs_encoder_t *encoder, video_t *video) { const struct video_output_info *voi; diff -Nru obs-studio-0.11.0.1/libobs/obs.h obs-studio-0.11.1/libobs/obs.h --- obs-studio-0.11.0.1/libobs/obs.h 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/libobs/obs.h 2015-07-09 20:17:30.000000000 +0000 @@ -1385,6 +1385,9 @@ /** For video encoders, returns the height of the encoded image */ EXPORT uint32_t obs_encoder_get_height(const obs_encoder_t *encoder); +/** For audio encoders, returns the sample rate of the audio */ +EXPORT uint32_t obs_encoder_get_sample_rate(const obs_encoder_t *encoder); + /** * Sets the preferred video format for a video encoder. If the encoder can use * the format specified, it will force a conversion to that format if the diff -Nru obs-studio-0.11.0.1/libobs/obs-source.c obs-studio-0.11.1/libobs/obs-source.c --- obs-studio-0.11.0.1/libobs/obs-source.c 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/libobs/obs-source.c 2015-07-09 20:17:30.000000000 +0000 @@ -1399,7 +1399,8 @@ { if (!source) return; - if ((source->info.output_flags & OBS_SOURCE_VIDEO) == 0) + if (source->info.type != OBS_SOURCE_TYPE_FILTER && + (source->info.output_flags & OBS_SOURCE_VIDEO) == 0) return; if (!source->context.data || !source->enabled) { diff -Nru obs-studio-0.11.0.1/obs/window-basic-main.cpp obs-studio-0.11.1/obs/window-basic-main.cpp --- obs-studio-0.11.0.1/obs/window-basic-main.cpp 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/obs/window-basic-main.cpp 2015-07-09 20:17:30.000000000 +0000 @@ -1124,6 +1124,15 @@ #endif } +void OBSBasic::SaveProjectNow() +{ + if (disableSaving) + return; + + projectChanged = true; + SaveProjectDeferred(); +} + void OBSBasic::SaveProject() { if (disableSaving) @@ -2199,8 +2208,7 @@ // the destructor gets called obs_remove_draw_callback(OBSBasic::RenderMain, this); - projectChanged = true; - SaveProjectDeferred(); + SaveProjectNow(); disableSaving++; /* Clear all scene data (dialogs, widgets, widget sub-items, scenes, diff -Nru obs-studio-0.11.0.1/obs/window-basic-main.hpp obs-studio-0.11.1/obs/window-basic-main.hpp --- obs-studio-0.11.0.1/obs/window-basic-main.hpp 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/obs/window-basic-main.hpp 2015-07-09 20:17:30.000000000 +0000 @@ -184,6 +184,8 @@ void RefreshProfiles(); void ChangeProfile(); + void SaveProjectNow(); + obs_hotkey_pair_id streamingHotkeys, recordingHotkeys; public slots: diff -Nru obs-studio-0.11.0.1/obs/window-basic-main-scene-collections.cpp obs-studio-0.11.1/obs/window-basic-main-scene-collections.cpp --- obs-studio-0.11.0.1/obs/window-basic-main-scene-collections.cpp 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/obs/window-basic-main-scene-collections.cpp 2015-07-09 20:17:30.000000000 +0000 @@ -161,7 +161,7 @@ if (!GetSceneCollectionName(this, name, file)) return; - SaveProject(); + SaveProjectNow(); config_set_string(App()->GlobalConfig(), "Basic", "SceneCollection", name.c_str()); @@ -170,7 +170,7 @@ if (create_new) { CreateDefaultScene(); } - SaveProject(); + SaveProjectNow(); RefreshSceneCollections(); blog(LOG_INFO, "Added scene collection '%s' (%s, %s.json)", @@ -246,7 +246,7 @@ name.c_str()); config_set_string(App()->GlobalConfig(), "Basic", "SceneCollectionFile", file.c_str()); - SaveProject(); + SaveProjectNow(); char path[512]; int ret = GetConfigPath(path, 512, "obs-studio/basic/scenes/"); @@ -348,7 +348,7 @@ return; } - SaveProject(); + SaveProjectNow(); Load(fileName.c_str()); RefreshSceneCollections(); diff -Nru obs-studio-0.11.0.1/plugins/obs-ffmpeg/obs-ffmpeg-mux.c obs-studio-0.11.1/plugins/obs-ffmpeg/obs-ffmpeg-mux.c --- obs-studio-0.11.0.1/plugins/obs-ffmpeg/obs-ffmpeg-mux.c 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/plugins/obs-ffmpeg/obs-ffmpeg-mux.c 2015-07-09 20:17:30.000000000 +0000 @@ -105,7 +105,7 @@ dstr_catf(cmd, "\"%s\" %d %d %d ", name.array, bitrate, - (int)audio_output_get_sample_rate(audio), + (int)obs_encoder_get_sample_rate(aencoder), (int)audio_output_get_channels(audio)); dstr_free(&name); diff -Nru obs-studio-0.11.0.1/plugins/obs-outputs/flv-mux.c obs-studio-0.11.1/plugins/obs-outputs/flv-mux.c --- obs-studio-0.11.0.1/plugins/obs-outputs/flv-mux.c 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/plugins/obs-outputs/flv-mux.c 2015-07-09 20:17:30.000000000 +0000 @@ -95,7 +95,7 @@ enc_str_val(&enc, end, "audiocodecid", "mp4a"); enc_num_val(&enc, end, "audiodatarate", encoder_bitrate(aencoder)); enc_num_val(&enc, end, "audiosamplerate", - (double)audio_output_get_sample_rate(audio)); + (double)obs_encoder_get_sample_rate(aencoder)); enc_num_val(&enc, end, "audiosamplesize", 16.0); enc_num_val(&enc, end, "audiochannels", (double)audio_output_get_channels(audio)); diff -Nru obs-studio-0.11.0.1/plugins/win-mf/mf-aac-encoder.cpp obs-studio-0.11.1/plugins/win-mf/mf-aac-encoder.cpp --- obs-studio-0.11.0.1/plugins/win-mf/mf-aac-encoder.cpp 2015-07-09 07:04:08.000000000 +0000 +++ obs-studio-0.11.1/plugins/win-mf/mf-aac-encoder.cpp 2015-07-09 20:17:30.000000000 +0000 @@ -130,7 +130,7 @@ *extraData16 = profile << 11; // Sample Index (3=48, 4=44.1) // .... .XXX X... .... - *extraData16 |= sampleRate == 48000 ? 3 : 4 << 7; + *extraData16 |= (sampleRate == 48000 ? 3 : 4) << 7; // Channels // .... .... .XXX X... *extraData16 |= channels << 3;