diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 04:26:05 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 04:26:20 +0100 |
commit | 3be67f33a5f2fd9c08d6f0b86a3196e865484f7b (patch) | |
tree | 5c2b38ed84a82b18a73c931f33b0958bc42b9dc7 /ffprobe.c | |
parent | 983778f1f68a12b1e307572f48390428c0421a8e (diff) | |
parent | 7a1a63e34fa46af18311c2493fdaec9a93bdb750 (diff) | |
download | ffmpeg-3be67f33a5f2fd9c08d6f0b86a3196e865484f7b.tar.gz |
Merge commit '7a1a63e34fa46af18311c2493fdaec9a93bdb750'
* commit '7a1a63e34fa46af18311c2493fdaec9a93bdb750':
dashenc: Use pts for MPD timeline timestamps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions