diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-09 10:07:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-09 10:07:23 +0200 |
| commit | e914a21ada123c37086057ade35619c1df41cb9a (patch) | |
| tree | 920f9c1e20a9d886f69181061019aa3f37aaff19 /tools/cws2fws.c | |
| parent | 848295c2eeac23c07d9cb97a5200fa931bdd06f4 (diff) | |
| parent | 0677ddebc6e93c3aee1504be45cec1e8d7299581 (diff) | |
| download | ffmpeg-e914a21ada123c37086057ade35619c1df41cb9a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Rename the timestamp parameter to dts in write_hint_packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/cws2fws.c')
0 files changed, 0 insertions, 0 deletions