gh-drakmor/casparcg_server
Watch
1
0
Fork
You've already forked casparcg_server
 0
Code Issues Pull requests 1 Releases Activity

Merege with NRK fork #7

Open
drakmor wants to merge 2670 commits from nrkno/2.1.x into 2.1.x
pull from: nrkno/2.1.x
merge into: gh-drakmor:2.1.x
Conversation 0 Commits 2670 Files changed 14652 +2972723 -35689
drakmor commented 2019-03-13 12:15:59 -05:00 (Migrated from github.com)
No description provided.
This pull request has changes conflicting with the target branch.
  • .gitignore
  • CHANGELOG
  • CMakeLists.txt
  • README
  • README.md
  • accelerator/CMakeLists.txt
  • accelerator/StdAfx.h
  • accelerator/accelerator.cpp
  • accelerator/accelerator.h
  • accelerator/cpu/image/image_mixer.cpp
  • accelerator/cpu/image/image_mixer.h
  • accelerator/cpu/util/xmm.h
  • accelerator/ogl/image/image_kernel.cpp
  • accelerator/ogl/image/image_kernel.h
  • accelerator/ogl/image/image_mixer.cpp
  • accelerator/ogl/image/image_mixer.h
  • accelerator/ogl/image/image_shader.cpp
  • accelerator/ogl/util/buffer.cpp
  • accelerator/ogl/util/buffer.h
  • accelerator/ogl/util/device.cpp
  • accelerator/ogl/util/device.h
  • accelerator/ogl/util/texture.cpp
  • accelerator/ogl/util/texture.h
  • build-scripts/build-linux.sh
  • build-scripts/build-windows.bat
  • common/CMakeLists.txt
  • common/compiler/vs/disable_silly_warnings.h
  • common/diagnostics/graph.h
  • common/executor.h
  • common/log.cpp
  • common/memory.h
  • common/os/windows/page_locked_allocator.cpp
  • common/polling_filesystem_monitor.cpp
  • common/thread_info.h
  • core/CMakeLists.txt
  • core/StdAfx.h
  • core/consumer/frame_consumer.cpp
  • core/consumer/frame_consumer.h
  • core/consumer/output.cpp
  • core/consumer/output.h
  • core/consumer/port.cpp
  • core/consumer/port.h
  • core/consumer/syncto/syncto_consumer.cpp
  • core/consumer/write_frame_consumer.h
  • core/diagnostics/osd_graph.cpp
  • core/frame/audio_channel_layout.cpp
  • core/frame/audio_channel_layout.h
  • core/frame/frame.cpp
  • core/frame/frame.h
  • core/frame/frame_factory.h
  • core/frame/frame_transform.cpp
  • core/frame/frame_transform.h
  • core/frame/geometry.cpp
  • core/frame/geometry.h
  • core/fwd.h
  • core/mixer/audio/audio_mixer.cpp
  • core/mixer/audio/audio_util.h
  • core/mixer/mixer.cpp
  • core/monitor/monitor.h
  • core/producer/cg_proxy.cpp
  • core/producer/color/color_producer.cpp
  • core/producer/color/color_producer.h
  • core/producer/frame_producer.cpp
  • core/producer/frame_producer.h
  • core/producer/framerate/framerate_producer.cpp
  • core/producer/layer.cpp
  • core/producer/layer.h
  • core/producer/scene/expression_parser.cpp
  • core/producer/scene/hotswap_producer.cpp
  • core/producer/scene/hotswap_producer.h
  • core/producer/scene/scene_cg_proxy.cpp
  • core/producer/scene/scene_producer.cpp
  • core/producer/scene/scene_producer.h
  • core/producer/scene/xml_scene_producer.cpp
  • core/producer/separated/separated_producer.cpp
  • core/producer/stage.cpp
  • core/producer/stage.h
  • core/producer/text/text_producer.cpp
  • core/producer/text/text_producer.h
  • core/producer/text/utils/texture_atlas.cpp
  • core/producer/text/utils/texture_atlas.h
  • core/producer/text/utils/texture_font.cpp
  • core/producer/text/utils/texture_font.h
  • core/producer/transition/transition_producer.cpp
  • core/producer/transition/transition_producer.h
  • core/producer/variable.h
  • core/thumbnail_generator.cpp
  • core/thumbnail_generator.h
  • core/video_channel.cpp
  • core/video_channel.h
  • core/video_format.cpp
  • core/video_format.h
  • dependencies64/boost/boost/property_tree/detail/json_parser/standard_callbacks.hpp
  • dependencies64/boost/stage/lib/win32/libboost_atomic-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_atomic-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_bzip2-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_bzip2-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_chrono-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_chrono-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_container-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_container-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_context-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_context-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_coroutine-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_coroutine-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_date_time-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_date_time-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_exception-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_exception-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_filesystem-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_filesystem-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_graph-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_graph-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_iostreams-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_iostreams-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_locale-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_locale-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_log-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_log-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_log_setup-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_log_setup-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_c99-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_c99-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_c99f-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_c99f-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_c99l-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_c99l-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_tr1-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_tr1-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_tr1f-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_tr1f-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_tr1l-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_math_tr1l-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_prg_exec_monitor-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_prg_exec_monitor-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_program_options-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_program_options-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_python-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_python-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_random-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_random-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_regex-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_regex-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_serialization-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_serialization-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_signals-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_signals-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_system-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_system-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_test_exec_monitor-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_test_exec_monitor-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_thread-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_thread-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_timer-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_timer-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_unit_test_framework-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_unit_test_framework-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_wave-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_wserialization-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_wserialization-vc140-mt-gd-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_zlib-vc140-mt-1_59.lib
  • dependencies64/boost/stage/lib/win32/libboost_zlib-vc140-mt-gd-1_59.lib
  • dependencies64/freeimage/bin/win32/FreeImage.dll
  • dependencies64/freeimage/bin/win32/FreeImaged.dll
  • dependencies64/freeimage/lib/linux/libfreeimage.so.3
  • dependencies64/freeimage/lib/win32/FreeImage.lib
  • dependencies64/freeimage/lib/win32/FreeImaged.lib
  • dependencies64/freetype/docs/VERSION.DLL
  • dependencies64/freetype/objs/win32/vc2010/freetype250.lib
  • dependencies64/freetype/objs/win32/vc2010/freetype250MT.lib
  • dependencies64/freetype/objs/win32/vc2010/freetype250MT_D.lib
  • dependencies64/freetype/objs/win32/vc2010/freetype250ST.lib
  • dependencies64/freetype/objs/win32/vc2010/freetype250ST_D.lib
  • dependencies64/freetype/objs/win32/vc2010/freetype250_D.lib
  • dependencies64/glew/bin/win32/glew32.dll
  • dependencies64/glew/bin/win32/glewinfo.exe
  • dependencies64/glew/include/GL/glew.h
  • dependencies64/glew/include/GL/glxew.h
  • dependencies64/glew/include/GL/wglew.h
  • dependencies64/glew/lib/win32/glew32.lib
  • dependencies64/gtest/lib/win32/gtest.lib
  • dependencies64/gtest/lib/win32/gtestd.lib
  • dependencies64/large_files_linux.tar.xz
  • dependencies64/large_files_win32.7z
  • dependencies64/openal/bin/win32/OpenAL32.dll
  • dependencies64/openal/lib/linux/libopenal.so.1.16.0
  • dependencies64/openal/lib/win32/OpenAL32.lib
  • dependencies64/sfml/extlibs/lib/freetype.lib
  • dependencies64/sfml/extlibs/lib/glew.lib
  • dependencies64/sfml/extlibs/lib/jpeg.lib
  • dependencies64/sfml/extlibs/lib/openal32.lib
  • dependencies64/sfml/extlibs/lib/sndfile.lib
  • dependencies64/sfml/lib/win32/sfml-audio-2.lib
  • dependencies64/sfml/lib/win32/sfml-audio-d-2.lib
  • dependencies64/sfml/lib/win32/sfml-graphics-2.lib
  • dependencies64/sfml/lib/win32/sfml-graphics-d-2.lib
  • dependencies64/sfml/lib/win32/sfml-system-2.lib
  • dependencies64/sfml/lib/win32/sfml-system-d-2.lib
  • dependencies64/sfml/lib/win32/sfml-window-2.lib
  • dependencies64/sfml/lib/win32/sfml-window-d-2.lib
  • dependencies64/tbb/bin/win32/tbbmalloc.dll
  • dependencies64/tbb/bin/win32/tbbmalloc_debug.dll
  • dependencies64/tbb/bin/win32/tbbmalloc_proxy.dll
  • dependencies64/tbb/bin/win32/tbbmalloc_proxy_debug.dll
  • dependencies64/tbb/include/tbb/blocked_range.h
  • dependencies64/tbb/include/tbb/blocked_range2d.h
  • dependencies64/tbb/include/tbb/blocked_range3d.h
  • dependencies64/tbb/include/tbb/cache_aligned_allocator.h
  • dependencies64/tbb/include/tbb/combinable.h
  • dependencies64/tbb/include/tbb/concurrent_hash_map.h
  • dependencies64/tbb/include/tbb/concurrent_lru_cache.h
  • dependencies64/tbb/include/tbb/concurrent_priority_queue.h
  • dependencies64/tbb/include/tbb/concurrent_queue.h
  • dependencies64/tbb/include/tbb/concurrent_unordered_map.h
  • dependencies64/tbb/include/tbb/concurrent_unordered_set.h
  • dependencies64/tbb/include/tbb/concurrent_vector.h
  • dependencies64/tbb/include/tbb/enumerable_thread_specific.h
  • dependencies64/tbb/include/tbb/flow_graph.h
  • dependencies64/tbb/include/tbb/global_control.h
  • dependencies64/tbb/include/tbb/memory_pool.h
  • dependencies64/tbb/include/tbb/null_mutex.h
  • dependencies64/tbb/include/tbb/null_rw_mutex.h
  • dependencies64/tbb/include/tbb/parallel_for.h
  • dependencies64/tbb/include/tbb/parallel_for_each.h
  • dependencies64/tbb/include/tbb/parallel_invoke.h
  • dependencies64/tbb/include/tbb/parallel_reduce.h
  • dependencies64/tbb/include/tbb/parallel_scan.h
  • dependencies64/tbb/include/tbb/parallel_sort.h
  • dependencies64/tbb/include/tbb/partitioner.h
  • dependencies64/tbb/include/tbb/queuing_mutex.h
  • dependencies64/tbb/include/tbb/queuing_rw_mutex.h
  • dependencies64/tbb/include/tbb/scalable_allocator.h
  • dependencies64/tbb/include/tbb/spin_mutex.h
  • dependencies64/tbb/include/tbb/spin_rw_mutex.h
  • dependencies64/tbb/include/tbb/task.h
  • dependencies64/tbb/include/tbb/task_arena.h
  • dependencies64/tbb/include/tbb/task_group.h
  • dependencies64/tbb/include/tbb/task_scheduler_observer.h
  • dependencies64/tbb/include/tbb/tbb.h
  • dependencies64/tbb/include/tbb/tbb_allocator.h
  • dependencies64/tbb/include/tbb/tbbmalloc_proxy.h
  • dependencies64/tbb/include/tbb/tick_count.h
  • dependencies64/tbb/lib/win32/tbb.lib
  • dependencies64/tbb/lib/win32/tbb_debug.lib
  • dependencies64/tbb/lib/win32/tbbmalloc.lib
  • dependencies64/tbb/lib/win32/tbbmalloc_debug.lib
  • dependencies64/tbb/lib/win32/tbbmalloc_proxy.lib
  • dependencies64/tbb/lib/win32/tbbmalloc_proxy_debug.lib
  • dependencies64/zlib/lib/zlibstat.lib
  • modules/bluefish/CMakeLists.txt
  • modules/bluefish/StdAfx.h
  • modules/bluefish/bluefish.cpp
  • modules/bluefish/consumer/bluefish_consumer.cpp
  • modules/decklink/StdAfx.h
  • modules/decklink/consumer/decklink_consumer.cpp
  • modules/decklink/producer/decklink_producer.cpp
  • modules/ffmpeg/CMakeLists.txt
  • modules/ffmpeg/StdAfx.h
  • modules/ffmpeg/consumer/ffmpeg_consumer.cpp
  • modules/ffmpeg/ffmpeg.cpp
  • modules/ffmpeg/ffmpeg_error.cpp
  • modules/ffmpeg/producer/audio/audio_decoder.cpp
  • modules/ffmpeg/producer/audio/audio_decoder.h
  • modules/ffmpeg/producer/ffmpeg_producer.cpp
  • modules/ffmpeg/producer/input/input.cpp
  • modules/ffmpeg/producer/input/input.h
  • modules/ffmpeg/producer/muxer/frame_muxer.cpp
  • modules/ffmpeg/producer/muxer/frame_muxer.h
  • modules/ffmpeg/producer/tbb_avcodec.cpp
  • modules/ffmpeg/producer/util/util.cpp
  • modules/ffmpeg/producer/video/video_decoder.cpp
  • modules/ffmpeg/producer/video/video_decoder.h
  • modules/flash/StdAfx.h
  • modules/flash/producer/FlashAxContainer.cpp
  • modules/flash/producer/flash_producer.cpp
  • modules/html/CMakeLists.txt
  • modules/html/html.cpp
  • modules/html/producer/html_cg_proxy.cpp
  • modules/html/producer/html_producer.cpp
  • modules/html/producer/html_producer.h
  • modules/image/CMakeLists.txt
  • modules/image/consumer/image_consumer.cpp
  • modules/image/producer/image_producer.cpp
  • modules/image/util/image_loader.cpp
  • modules/newtek/consumer/newtek_ivga_consumer.cpp
  • modules/oal/CMakeLists.txt
  • modules/oal/consumer/oal_consumer.cpp
  • modules/psd/layer.cpp
  • modules/psd/layer.h
  • modules/psd/misc.cpp
  • modules/psd/misc.h
  • modules/psd/psd_scene_producer.cpp
  • modules/psd/util/pdf_reader.cpp
  • modules/reroute/producer/channel_producer.cpp
  • modules/reroute/producer/channel_producer.h
  • modules/reroute/producer/layer_producer.cpp
  • modules/reroute/producer/layer_producer.h
  • modules/reroute/producer/reroute_producer.cpp
  • modules/screen/consumer/screen_consumer.cpp
  • protocol/CMakeLists.txt
  • protocol/amcp/AMCPCommand.h
  • protocol/amcp/AMCPCommandQueue.cpp
  • protocol/amcp/AMCPCommandQueue.h
  • protocol/amcp/AMCPCommandsImpl.cpp
  • protocol/amcp/AMCPCommandsImpl.h
  • protocol/amcp/AMCPProtocolStrategy.cpp
  • protocol/amcp/AMCPProtocolStrategy.h
  • protocol/amcp/amcp_command_repository.cpp
  • protocol/amcp/amcp_command_repository.h
  • protocol/amcp/amcp_shared.h
  • protocol/cii/CIICommandsImpl.cpp
  • protocol/cii/CIIProtocolStrategy.cpp
  • protocol/cii/CIIProtocolStrategy.h
  • protocol/clk/CLKProtocolStrategy.cpp
  • protocol/clk/CLKProtocolStrategy.h
  • protocol/clk/clk_commands.cpp
  • protocol/clk/clk_commands.h
  • protocol/osc/client.cpp
  • protocol/osc/client.h
  • protocol/util/AsyncEventServer.cpp
  • protocol/util/ClientInfo.h
  • protocol/util/protocol_strategy.h
  • protocol/util/strategy_adapters.cpp
  • shell/CMakeLists.txt
  • shell/casparcg.config
  • shell/casparcg_auto_restart.bat
  • shell/main.cpp
  • shell/server.cpp
  • shell/server.h
  • shell/windows_specific.cpp
  • version.tmpl
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'nrkno/2.1.x:nrkno/2.1.x'
git switch 'nrkno/2.1.x'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch '2.1.x'
git merge --no-ff 'nrkno/2.1.x'
git switch 'nrkno/2.1.x'
git rebase '2.1.x'
git switch '2.1.x'
git merge --ff-only 'nrkno/2.1.x'
git switch 'nrkno/2.1.x'
git rebase '2.1.x'
git switch '2.1.x'
git merge --no-ff 'nrkno/2.1.x'
git switch '2.1.x'
git merge --squash 'nrkno/2.1.x'
git switch '2.1.x'
git merge --ff-only 'nrkno/2.1.x'
git switch '2.1.x'
git merge 'nrkno/2.1.x'
git push origin '2.1.x'
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
Something isn't working

  
duplicate
This issue or pull request already exists

  
enhancement
New feature or request

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
invalid
This doesn't seem right

  
question
Further information is requested

  
wontfix
This will not be worked on

No labels
bug
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
gh-drakmor/casparcg_server!7
No description provided.