Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'

Browse Source

* commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee':
  mpegtsenc: recognize .mts as MPEG Transport Stream

Conflicts:
	libavformat/mpegtsenc.c

See: e2baaa21aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/100/head

Michael Niedermayer 10 years ago

parent d76adfae9c 7319a47c7e

commit b329460c51

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available