Merge commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:57:15 +0000 (15:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 14:04:41 +0000 (16:04 +0200)
* commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52':
  mov: Don't use a negative duration for setting other fields

Conflicts:
libavformat/mov.c

See: 87d073eaccc00ef2909445ae4b25128c440d9efa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mov.c

Simple merge