diff options
author | Michael Niedermayer <[email protected]> | 2013-08-18 12:01:08 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2013-08-18 12:40:22 +0200 |
commit | 45975ab7a192d7c687e77342de2ddfebb3b2fa4d (patch) | |
tree | 67b1494f621a73ab969ffa28f5c02a5d05ab4e03 /ffmpeg.c | |
parent | 66722b4ba955eebef77045644a082505cfa134fa (diff) | |
parent | 0a14fefd68cc18ce3252edff8a05ee9b3945b694 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Indicate that negative timestamps are supported
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions