diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 22:53:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 22:53:22 +0100 |
| commit | b329460c5186d4520f1761211efa99fcf93cf538 (patch) | |
| tree | afdc356e7f2e36d3ccd6d1bcd898da3c03fca9b2 /libavdevice/decklink_common.cpp | |
| parent | d76adfae9cbcdfcfba6a11936feff22f9360dd49 (diff) | |
| parent | 7319a47c7e7931ebf8f475cc2cffc7bcd333acee (diff) | |
| download | ffmpeg-b329460c5186d4520f1761211efa99fcf93cf538.tar.gz | |
Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'
* commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee':
mpegtsenc: recognize .mts as MPEG Transport Stream
Conflicts:
libavformat/mpegtsenc.c
See: e2baaa21aabc7edb3c2275eac39ed1d40884b25a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/decklink_common.cpp')
0 files changed, 0 insertions, 0 deletions