Skip to content
Commit f6cdea01 authored by Reinhard Tartler's avatar Reinhard Tartler
Browse files

Merge branch 'upstream.experimental' into upstream 

Conflicts:
	Changelog
	RELEASE
	VERSION
	libavformat/mpegtsenc.c
parents 13308eae 7ae221aa
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment