Merge branch 'development' into LTS_development

Browse source

# Conflicts:
#	lib/dtscmeta.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output.h
#	src/output/output_http.cpp
#	src/output/output_http.h
#	src/output/output_progressive_mp4.cpp
#	src/output/output_rtmp.h

...

This commit is contained in:

Thulinma 2018-07-04 11:56:00 +02:00

parent a4e9ffe864 67cba61ed7

commit f926ceab0d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available