@@ -1,4 +1,47 @@

 -------------------------------------------------------------------

+Thu Jun 22 19:41:10 UTC 2017 - jimmy@boombatower.com

+

+- Update to version 19.0.3:

+  * rtmp-services: Update Twitch ingests

+  * librtmp: Fix build error with ENODATA on FreeBSD

+  * rtmp-services: Rename Beam to Mixer

+  * UI/installer: Specify "source" in plugins section

+  * UI/installer: Fix broken realsense plugin install locations

+  * UI/installer: Update installer VC redist download link

+  * win-wasapi: Fix potential null pointer deref in enumeration

+  * UI: Look for plugins in ~/Library/Application Support/obs-studio/plugins/

+  * libobs/plugins/UI: Suppress -Wimplicit-fallthrough introduced by GCC 7

+  * win-capture: Limit OpenProcess flags to prevent A/C issues

+  * deps/media-playback: Output av_read_frame error string

+  * deps/media-playback: Start decoding regardless of keyframe

+  * obs-ffmpeg: Add network buffering property

+  * deps/media-playback: Call stop callback on failure

+  * deps/media-playback: Fix lockup issues

+  * Revert "rtmp-services: Rename Beam to Mixer"

+  * rtmp-services: Add new twitch.tv ingests

+  * UI/updater: Fix incorrect path in portable mode

+  * deps/media-playback: Add timeout when waiting for frames

+  * deps/media-playback: Fix AV_NOPTS_VALUE being used as timestamp

+  * deps/media-playback: Fix playback reset fail after stop

+  * obs-ffmpeg: Don't preload media frames if set to pause on end

+  * win-capture/graphics-hook: Fix D3D10/D3D11 detection

+  * UI: Ignore first 2.5 seconds of bandwidth test

+  * UI: Initialize Stats window values after OBSInit/reset

+  * win-capture: Add IDXGISwapChain1::Present1 hook support

+  * win-capture: Use PROCESS_QUERY_INFORMATION for game capture

+  * obs-ffmpeg: Do not precache if set to close when inactive

+  * UI: Use QT_TO_UTF8 with name dialog

+  * libobs-d3d11: Fix shader const array size miscalculation

+  * UI: Preserve source if audio settings device changed

+  * libobs: Update version to 19.0.3

+  * UI: Set error mode to SEM_FAILCRITICALERRORS

+  * ffmpeg-mux: Set error mode to SEM_FAILCRITICALERRORS

+  * get-graphics-offsets: Set error mode to SEM_FAILCRITICALERRORS

+  * inject-helper: Set error mode to SEM_FAILCRITICALERRORS

+  * enc-amf: Version 2.1.6

+  * obs-ffmpeg: Remove "Buffering (MS)" property

+

+-------------------------------------------------------------------

 Wed Jun 14 22:47:57 UTC 2017 - jimmy@boombatower.com

 - Update to version 19.0.2:

​

@@ -1,5 +1,5 @@

 Name:           obs-studio

-Version:        19.0.2

+Version:        19.0.3

 Release:        0

 Summary:        A recording/broadcasting program

​

@@ -1,7 +1,7 @@

 <services>

   <service name="tar_scm" mode="disabled">

     <param name="versionformat">@PARENT_TAG@</param>

-    <param name="revision">refs/tags/19.0.2</param>

+    <param name="revision">refs/tags/19.0.3</param>

     <param name="url">git://github.com/jp9000/obs-studio.git</param>

     <param name="scm">git</param>

     <param name="changesgenerate">enable</param>

​

@@ -1,6 +1,6 @@

 <servicedata>

   <service name="tar_scm">

     <param name="url">git://github.com/jp9000/obs-studio.git</param>

-    <param name="changesrevision">870bf6b6fca2940f8cf37f10339564d393ac41bf</param>

+    <param name="changesrevision">d295ad3ed3eafc7550ffa4280abcf116ec9bad14</param>

   </service>

 </servicedata>

​

@@ -105,7 +105,7 @@

    vs2013Missing:

        MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing runtime components that ${APPNAME} requires. Please make sure to install both vcredist_x64 and vcredist_x86. Would you like to download them?" IDYES vs2013true IDNO vs2013false

        vs2013true:

-           ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=40784"

+           ExecShell "open" "https://obsproject.com/visual-studio-2013-runtimes"

        vs2013false:

        Quit

    vs2013OK:

@@ -273,7 +273,7 @@

 !ifdef FULL

 SectionGroup /e "Plugins" SecPlugins

-   Section "Browser plugin" SecPlugins_Browser

+   Section "Browser Source" SecPlugins_Browser

        ; Set Section properties

        SetOverwrite on

        AllowSkipFiles off

@@ -292,16 +292,16 @@

    SectionEnd

    !ifdef REALSENSE_PLUGIN

-   Section /o "Realsense plugin" SecPlugins_Realsense

+   Section /o "Realsense Source" SecPlugins_Realsense

        SetOverwrite on

        AllowSkipFiles off

        SetShellVarContext all

        SetOutPath "$INSTDIR\obs-plugins"

-       File /r "new\realsense\32bit"

+       File /r "new\realsense\obs-plugins\32bit"

        ${if} ${RunningX64}

-           File /r "new\realsense\64bit"

+           File /r "new\realsense\obs-plugins\64bit"

        ${endif}

        SetOutPath "$INSTDIR\data\obs-plugins"

​

@@ -164,6 +164,7 @@

            case Qt::Key_Return:

                if (dialog && pressed)

                    return false;

+               /* Falls through. */

            default:

                hotkey.key = obs_key_from_virtual_key(

                    event->nativeVirtualKey());

@@ -1835,6 +1836,7 @@

 #endif

 #ifdef _WIN32

+   SetErrorMode(SEM_FAILCRITICALERRORS);

    load_debug_privilege();

    base_set_crash_handler(main_crash_handler, nullptr);

 #endif

​

@@ -998,10 +998,11 @@

        }

        StringCbCopy(lpAppDataPath, sizeof(lpAppDataPath), pOut);

-       StringCbCat(lpAppDataPath, sizeof(lpAppDataPath),

-               L"\\obs-studio");

    }

+   StringCbCat(lpAppDataPath, sizeof(lpAppDataPath),

+           L"\\obs-studio");

+

    /* ------------------------------------- *

     * Get download path                     */

​

@@ -356,6 +356,19 @@

                Q_ARG(QString, QTStr(TEST_BW_SERVER)

                    .arg(server.name.c_str())));

+       /* ignore first 2.5 seconds due to possible buffering skewing

+        * the result */

+       cv.wait_for(ul, chrono::milliseconds(2500));

+       if (stopped)

+           continue;

+       if (cancel) {

+           ul.unlock();

+           obs_output_force_stop(output);

+           return;

+       }

+

+       /* continue test */

+       int start_bytes = (int)obs_output_get_total_bytes(output);

        uint64_t t_start = os_gettime_ns();

        cv.wait_for(ul, chrono::seconds(10));

@@ -372,7 +385,8 @@

        uint64_t total_time = os_gettime_ns() - t_start;

-       int total_bytes = (int)obs_output_get_total_bytes(output);

+       int total_bytes = (int)obs_output_get_total_bytes(output) -

+           start_bytes;

        uint64_t bitrate = (uint64_t)total_bytes * 8

            * 1000000000 / total_time / 1000;

​

@@ -115,6 +115,11 @@

    string path = (char*)base_module_dir;

 #if defined(__APPLE__)

    obs_add_module_path((path + "/bin").c_str(), (path + "/data").c_str());

+

+   BPtr<char> config_bin = os_get_config_path_ptr("obs-studio/plugins/%module%/bin");

+   BPtr<char> config_data = os_get_config_path_ptr("obs-studio/plugins/%module%/data");

+   obs_add_module_path(config_bin, config_data);

+

 #elif ARCH_BITS == 64

    obs_add_module_path((path + "/bin/64bit").c_str(),

            (path + "/data").c_str());

@@ -1458,6 +1463,8 @@

    if (config_get_bool(basicConfig, "General", "OpenStatsOnStartup"))

        on_stats_triggered();

+

+   OBSBasicStats::InitializeValues();

 }

 void OBSBasic::InitHotkeys()

@@ -2767,6 +2774,8 @@

            ResizeProgram(ovi.base_width, ovi.base_height);

    }

+   OBSBasicStats::InitializeValues();

+

    return ret;

 }

@@ -2792,26 +2801,30 @@

 void OBSBasic::ResetAudioDevice(const char *sourceId, const char *deviceId,

        const char *deviceDesc, int channel)

 {

+   bool disable = deviceId && strcmp(deviceId, "disabled") == 0;

    obs_source_t *source;

    obs_data_t *settings;

-   bool same = false;

    source = obs_get_output_source(channel);

    if (source) {

-       settings = obs_source_get_settings(source);

-       const char *curId = obs_data_get_string(settings, "device_id");

-

-       same = (strcmp(curId, deviceId) == 0);

+       if (disable) {

+           obs_set_output_source(channel, nullptr);

+       } else {

+           settings = obs_source_get_settings(source);

+           const char *oldId = obs_data_get_string(settings,

+                   "device_id");

+           if (strcmp(oldId, deviceId) != 0) {

+               obs_data_set_string(settings, "device_id",

+                       deviceId);

+               obs_source_update(source, settings);

+           }

+           obs_data_release(settings);

+       }

-       obs_data_release(settings);

        obs_source_release(source);

-   }

-

-   if (!same)

-       obs_set_output_source(channel, nullptr);

-   if (!same && strcmp(deviceId, "disabled") != 0) {

-       obs_data_t *settings = obs_data_create();

+   } else if (!disable) {

+       settings = obs_data_create();

        obs_data_set_string(settings, "device_id", deviceId);

        source = obs_source_create(sourceId, deviceDesc, settings,

                nullptr);

​

@@ -217,6 +217,15 @@

 static uint32_t first_rendered = 0xFFFFFFFF;

 static uint32_t first_lagged = 0xFFFFFFFF;

+void OBSBasicStats::InitializeValues()

+{

+   video_t *video = obs_get_video();

+   first_encoded  = video_output_get_total_frames(video);

+   first_skipped  = video_output_get_skipped_frames(video);

+   first_rendered = obs_get_total_frames();

+   first_lagged   = obs_get_lagged_frames();

+}

+

 void OBSBasicStats::Update()

 {

    OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());

​

@@ -57,4 +57,6 @@

 public:

    OBSBasicStats(QWidget *parent = nullptr);

    ~OBSBasicStats();

+

+   static void InitializeValues();

 };

​

@@ -16,6 +16,7 @@

 ******************************************************************************/

 #include "window-namedialog.hpp"

+#include "qt-wrappers.hpp"

 #include "ui_NameDialog.h"

 #include "obs-app.hpp"

@@ -46,7 +47,7 @@

    bool accepted = (dialog.exec() == DialogCode::Accepted);

    if (accepted) {

-       str = dialog.ui->userText->text().toStdString();

+       str = QT_TO_UTF8(dialog.ui->userText->text());

        while (str.size() && IsWhitespace(str.back()))

            str.erase(str.end() - 1);

​

@@ -279,18 +279,6 @@

            }

        }

-       if (!d->audio && d->m->is_network && !d->got_first_keyframe) {

-           if (d->pkt.flags & AV_PKT_FLAG_KEY) {

-               d->got_first_keyframe = true;

-           } else {

-               av_packet_unref(&d->orig_pkt);

-               av_init_packet(&d->orig_pkt);

-               av_init_packet(&d->pkt);

-               d->packet_pending = false;

-               return true;

-           }

-       }

-

        ret = decode_packet(d, &got_frame);

        if (!got_frame && ret == 0) {

@@ -332,9 +320,13 @@

    if (d->frame_ready) {

        int64_t last_pts = d->frame_pts;

-       d->frame_pts = av_rescale_q(d->frame->best_effort_timestamp,

-               d->stream->time_base,

-               (AVRational){1, 1000000000});

+       if (d->frame->best_effort_timestamp == AV_NOPTS_VALUE)

+           d->frame_pts = d->next_pts;

+       else

+           d->frame_pts = av_rescale_q(

+                   d->frame->best_effort_timestamp,

+                   d->stream->time_base,

+                   (AVRational){1, 1000000000});

        int64_t duration = d->frame->pkt_duration;

        if (!duration)

@@ -343,6 +335,7 @@

            duration = av_rescale_q(duration,

                    d->stream->time_base,

                    (AVRational){1, 1000000000});

+

        d->last_duration = duration;

        d->next_pts = d->frame_pts + duration;

    }

​

@@ -92,7 +92,8 @@

    int ret = av_read_frame(media->fmt, &pkt);

    if (ret < 0) {

        if (ret != AVERROR_EOF)

-           blog(LOG_WARNING, "MP: av_read_frame failed: %d", ret);

+           blog(LOG_WARNING, "MP: av_read_frame failed: %s (%d)",

+                   av_err2str(ret), ret);

        return ret;

    }

@@ -356,6 +357,13 @@

    frame->height = f->height;

    frame->flip = flip;

+   if (m->is_network && !d->got_first_keyframe) {

+       if (!f->key_frame)

+           return;

+

+       d->got_first_keyframe = true;

+   }

+

    if (preload)

        m->v_preload_cb(m->opaque, frame);

    else

@@ -419,15 +427,15 @@

    m->eof = false;

    m->base_ts += next_ts;

-   if (!mp_media_prepare_frames(m))

-       return false;

-

    pthread_mutex_lock(&m->mutex);

    stopping = m->stopping;

    active = m->active;

    m->stopping = false;

    pthread_mutex_unlock(&m->mutex);

+   if (!mp_media_prepare_frames(m))

+       return false;

+

    if (active) {

        if (!m->play_sys_ts)

            m->play_sys_ts = (int64_t)os_gettime_ns();

@@ -447,12 +455,25 @@

    return true;

 }

-static inline void mp_media_sleepto(mp_media_t *m)

+static inline bool mp_media_sleepto(mp_media_t *m)

 {

-   if (!m->next_ns)

+   bool timeout = false;

+

+   if (!m->next_ns) {

        m->next_ns = os_gettime_ns();

-   else

-       os_sleepto_ns(m->next_ns);

+   } else {

+       uint64_t t = os_gettime_ns();

+       const uint64_t timeout_ns = 200000000;

+

+       if (m->next_ns > t && (m->next_ns - t) > timeout_ns) {

+           os_sleepto_ns(t + timeout_ns);

+           timeout = true;

+       } else {

+           os_sleepto_ns(m->next_ns);

+       }

+   }

+

+   return timeout;

 }

 static inline bool mp_media_eof(mp_media_t *m)

@@ -478,6 +499,23 @@

    return eof;

 }

+static int interrupt_callback(void *data)

+{

+   mp_media_t *m = data;

+   bool stop = false;

+   uint64_t ts = os_gettime_ns();

+

+   if ((ts - m->interrupt_poll_ts) > 20000000) {

+       pthread_mutex_lock(&m->mutex);

+       stop = m->kill || m->stopping;

+       pthread_mutex_unlock(&m->mutex);

+

+       m->interrupt_poll_ts = ts;

+   }

+

+   return stop;

+}

+

 static bool init_avformat(mp_media_t *m)

 {

    AVInputFormat *format = NULL;

@@ -489,7 +527,18 @@

                    "'%s'", m->path);

    }

-   int ret = avformat_open_input(&m->fmt, m->path, format, NULL);

+   AVDictionary *opts = NULL;

+   if (m->buffering && m->is_network)

+       av_dict_set_int(&opts, "buffer_size", m->buffering, 0);

+

+   m->fmt = avformat_alloc_context();

+   m->fmt->interrupt_callback.callback = interrupt_callback;

+   m->fmt->interrupt_callback.opaque = m;

+

+   int ret = avformat_open_input(&m->fmt, m->path, format,

+           opts ? &opts : NULL);

+   av_dict_free(&opts);

+

    if (ret < 0) {

        blog(LOG_WARNING, "MP: Failed to open media: '%s'", m->path);

        return false;

@@ -513,20 +562,20 @@

    return true;

 }

-static void *mp_media_thread(void *opaque)

+static inline bool mp_media_thread(mp_media_t *m)

 {

-   mp_media_t *m = opaque;

-

    os_set_thread_name("mp_media_thread");

    if (!init_avformat(m)) {

-       return NULL;

+       return false;

+   }

+   if (!mp_media_reset(m)) {

+       return false;

    }

-

-   mp_media_reset(m);

    for (;;) {

        bool reset, kill, is_active;

+       bool timeout = false;

        pthread_mutex_lock(&m->mutex);

        is_active = m->active;

@@ -534,9 +583,9 @@

        if (!is_active) {

            if (os_sem_wait(m->sem) < 0)

-               return NULL;

+               return false;

        } else {

-           mp_media_sleepto(m);

+           timeout = mp_media_sleepto(m);

        }

        pthread_mutex_lock(&m->mutex);

@@ -557,14 +606,14 @@

        }

        /* frames are ready */

-       if (is_active) {

+       if (is_active && !timeout) {

            if (m->has_video)

                mp_media_next_video(m, false);

            if (m->has_audio)

                mp_media_next_audio(m);

            if (!mp_media_prepare_frames(m))

-               return NULL;

+               return false;

            if (mp_media_eof(m))

                continue;

@@ -572,6 +621,19 @@

        }

    }

+   return true;

+}

+

+static void *mp_media_thread_start(void *opaque)

+{

+   mp_media_t *m = opaque;

+

+   if (!mp_media_thread(m)) {

+       if (m->stop_cb) {

+           m->stop_cb(m->opaque);

+       }

+   }

+

    return NULL;

 }

@@ -593,7 +655,7 @@

    m->format_name = format_name ? bstrdup(format_name) : NULL;

    m->hw = hw;

-   if (pthread_create(&m->thread, NULL, mp_media_thread, m) != 0) {

+   if (pthread_create(&m->thread, NULL, mp_media_thread_start, m) != 0) {

        blog(LOG_WARNING, "MP: Could not create media thread");

        return false;

    }

@@ -605,6 +667,7 @@

 bool mp_media_init(mp_media_t *media,

        const char *path,

        const char *format,

+       int buffering,

        void *opaque,

        mp_video_cb v_cb,

        mp_audio_cb a_cb,

@@ -621,6 +684,7 @@

    media->stop_cb = stop_cb;

    media->v_preload_cb = v_preload_cb;

    media->force_range = force_range;

+   media->buffering = buffering;

    if (path && *path)

        media->is_network = !!strstr(path, "://");

@@ -666,9 +730,9 @@

    mp_kill_thread(media);

    mp_decode_free(&media->v);

    mp_decode_free(&media->a);

+   avformat_close_input(&media->fmt);

    pthread_mutex_destroy(&media->mutex);

    os_sem_destroy(media->sem);

-   avformat_close_input(&media->fmt);

    sws_freeContext(media->swscale);

    av_freep(&media->scale_pic[0]);

    bfree(media->path);

​

@@ -53,6 +53,7 @@

    char *path;

    char *format_name;

+   int buffering;

    enum AVPixelFormat scale_format;

    struct SwsContext *swscale;

@@ -79,6 +80,8 @@

    int64_t start_ts;

    int64_t base_ts;

+   uint64_t interrupt_poll_ts;

+

    pthread_mutex_t mutex;

    os_sem_t *sem;

    bool stopping;

@@ -96,6 +99,7 @@

 extern bool mp_media_init(mp_media_t *media,

        const char *path,

        const char *format,

+       int buffering,

        void *opaque,

        mp_video_cb v_cb,

        mp_audio_cb a_cb,

​

@@ -149,6 +149,9 @@

            continue;

        }

+       if (param.arrayCount)

+           size *= param.arrayCount;

+

        /* checks to see if this constant needs to start at a new

         * register */

        if (size && (constantSize & 15) != 0) {

​

@@ -228,12 +228,14 @@

        case PARSE_UNEXPECTED_CONTINUE:

            cf_adderror_syntax_error(&ep->cfp);

+           /* Falls through. */

        case PARSE_CONTINUE:

            ep_var_free(&var);

            continue;

        case PARSE_UNEXPECTED_BREAK:

            cf_adderror_syntax_error(&ep->cfp);

+           /* Falls through. */

        case PARSE_BREAK:

            ep_var_free(&var);

            do_break = true;

​

@@ -277,12 +277,14 @@

        case PARSE_UNEXPECTED_CONTINUE:

            cf_adderror_syntax_error(&sp->cfp);

+           /* Falls through. */

        case PARSE_CONTINUE:

            shader_var_free(&var);

            continue;

        case PARSE_UNEXPECTED_BREAK:

            cf_adderror_syntax_error(&sp->cfp);

+           /* Falls through. */

        case PARSE_BREAK:

            shader_var_free(&var);

            do_break = true;

​

@@ -41,7 +41,7 @@

  *

  * Reset to zero each major or minor version

  */

-#define LIBOBS_API_PATCH_VER  2

+#define LIBOBS_API_PATCH_VER  3

 #define MAKE_SEMANTIC_VERSION(major, minor, patch) \

                              ((major << 24) | \

​

@@ -123,6 +123,7 @@

            start_token->type = BASETOKEN_DIGIT;

            break;

        }

+       /* Falls through. */

    case BASETOKEN_NONE:

        return true;

​

@@ -1,10 +1,14 @@

-# 2.1.5 - Now with full-range colors! (Hotfix 2)

+# 2.1.6 - Now with full-range colors! (Hotfix 2)

 Gone are the days of boring bland partial range recordings, here are the days of full range videos! With 2.1 the plugin implements several much wanted features, upgrading a few features from experimental to normal use and fixing a bunch of potential bugs.

 Hotfix 1: 'Encoding overloaded!' should no longer show up for systems which were perfectly capable recording at the same fps in versions before 2.x. Also fixed debug log lines showing up without the Debug option being checked.

 Hotfix 2: Added a workaround for a Driver-induced crash when running 32-bit OBS Studio.

+Hotfix 3: Fixed a bug with the code handling the 'Enforce Streaming Service Settings' option which caused some settings to no longer work as intended.

 ## Changelog

+### 2.1.6

+* Fixed a bug that causes 'Enforce Streaming Service Settings' to always be applied to Target Bitrate, Peak Bitrate, Rate Control Method, Profile, Quality Preset and Keyframe Interval. (#228)

+

 ### 2.1.5

 * Added a workaround for a 32-bit crash caused by AMD Driver 17.5.2 and earlier.

​

@@ -1,3 +1,20 @@

+# A Plugin that integrates the AMD AMF encoder into OBS Studio

+# Copyright (C) 2016 - 2017 Michael Fabian Dirks

+#

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

+

 cmake_minimum_required(VERSION 2.8.12)

 PROJECT(enc-amf)

@@ -6,7 +23,7 @@

 ################################################################################

 SET(enc-amf_VERSION_MAJOR 2)

 SET(enc-amf_VERSION_MINOR 1)

-SET(enc-amf_VERSION_PATCH 5)

+SET(enc-amf_VERSION_PATCH 6)

 configure_file(

    "${PROJECT_SOURCE_DIR}/#Resources/package.in.bat"

    "${PROJECT_SOURCE_DIR}/#Resources/package.bat"

​

@@ -1,25 +1,20 @@

 /*

-MIT License

-

-Copyright (c) 2016-2017

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-SOFTWARE.

+ * A Plugin that integrates the AMD AMF encoder into OBS Studio

+ * Copyright (C) 2016 - 2017 Michael Fabian Dirks

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */

 #pragma once

​

@@ -1,25 +1,20 @@

 /*

-MIT License

-

-Copyright (c) 2016-2017

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-SOFTWARE.

+ * A Plugin that integrates the AMD AMF encoder into OBS Studio

+ * Copyright (C) 2016 - 2017 Michael Fabian Dirks

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */

 #pragma once

​

@@ -1,25 +1,20 @@

 /*

-MIT License

-

-Copyright (c) 2016-2017

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-SOFTWARE.

+ * A Plugin that integrates the AMD AMF encoder into OBS Studio

+ * Copyright (C) 2016 - 2017 Michael Fabian Dirks

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */

 #pragma once

​

@@ -1,25 +1,20 @@

 /*

-MIT License

-

-Copyright (c) 2016-2017

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-SOFTWARE.

+ * A Plugin that integrates the AMD AMF encoder into OBS Studio

+ * Copyright (C) 2016 - 2017 Michael Fabian Dirks

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */

 #pragma once

​

@@ -1,25 +1,20 @@

 /*

-MIT License

-

-Copyright (c) 2016-2017

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-SOFTWARE.

+ * A Plugin that integrates the AMD AMF encoder into OBS Studio

+ * Copyright (C) 2016 - 2017 Michael Fabian Dirks

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */

 #pragma once

​

@@ -1,25 +1,20 @@

 /*

-MIT License

-

-Copyright (c) 2016-2017

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-SOFTWARE.

+ * A Plugin that integrates the AMD AMF encoder into OBS Studio

+ * Copyright (C) 2016 - 2017 Michael Fabian Dirks

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */

 #pragma once

​

@@ -1,25 +1,20 @@

 /*

-MIT License

-

-Copyright (c) 2016-2017

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-SOFTWARE.

+ * A Plugin that integrates the AMD AMF encoder into OBS Studio

+ * Copyright (C) 2016 - 2017 Michael Fabian Dirks

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */

 #pragma once

​

@@ -1,25 +1,20 @@

 /*

-MIT License

-

-Copyright (c) 2016-2017

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER