diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-17 15:57:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-17 16:04:41 +0200 |
| commit | 7f20440b4c17c26067d588420449ae9066cad237 (patch) | |
| tree | d226ca3939e5bb15a6f799109b521c45a39364a7 /libswscale/utils.c | |
| parent | 5d12ec8fb7e6022f23e5c155e42e531cea9bd860 (diff) | |
| parent | 7f8d41eb097e8d4223c9caf97dd332a2fdb29d52 (diff) | |
Merge commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52'
* commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52':
mov: Don't use a negative duration for setting other fields
Conflicts:
libavformat/mov.c
See: 87d073eaccc00ef2909445ae4b25128c440d9efa
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libswscale/utils.c')
0 files changed, 0 insertions, 0 deletions