[FFmpeg-cvslog] Merge commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 15:57:15 2013 +0200| [7f20440b4c17c26067d588420449ae9066cad237] | committer: Michael Niedermayer

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 <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f20440b4c17c26067d588420449ae9066cad237
---