Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'

Browse Source

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

Conflicts:
	libavformat/mpegtsenc.c

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

...

This commit is contained in:

Michael Niedermayer 2014-12-02 22:53:22 +01:00

parent d76adfae9c 7319a47c7e

commit b329460c51

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 Not Available