diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 22:50:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 22:50:40 +0100 |
| commit | dce93218d7bb2ce5c57a99f87be636bbce9e7638 (patch) | |
| tree | 1542e6fa31bbdb1041a1d1ef2c2249d35c1a1ebb /arch.mak | |
| parent | 19b41f86457d945e98c236f67faf59d560861a4c (diff) | |
| parent | 16097efb8caa808d8e9130415e55e3be35eb1c3c (diff) | |
| download | ffmpeg-dce93218d7bb2ce5c57a99f87be636bbce9e7638.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Auto-detect hevc in mpeg-ts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions