[FFmpeg-cvslog] Merge commit '1384df641994bf3d6cb51084290aa94752737bae'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  7 22:59:00 2014 +0100| [66e49ff3b923c6feee8e6e3d73ae3c76708aa5f2] | committer: Michael Niedermayer

Merge commit '1384df641994bf3d6cb51084290aa94752737bae'

* commit '1384df641994bf3d6cb51084290aa94752737bae':
  lavf: Add an option for avoiding negative timestamps

Conflicts:
	libavformat/avformat.h
	libavformat/mux.c
	libavformat/options_table.h
	libavformat/version.h

See: 3ba0dab76ac32f0c9f50c916a73bc64e43c1fdf9
See: a89c01253190b9eb9de8e28a3252423bf7732511
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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