Michael Niedermayer 66e49ff3b9 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@gmx.at>
2014-11-07 23:09:30 +01:00
..
2014-07-20 02:01:50 +02:00
2014-06-03 10:58:19 -08:00
2014-10-18 00:48:49 +02:00
2014-10-22 23:12:38 +02:00
2014-05-28 03:52:50 +02:00
2013-02-14 23:45:48 +01:00
2014-07-17 11:29:01 +02:00