Merge commit '1384df641994bf3d6cb51084290aa94752737bae'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Nov 2014 21:59:00 +0000 (22:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Nov 2014 22:09:30 +0000 (23:09 +0100)
commit66e49ff3b923c6feee8e6e3d73ae3c76708aa5f2
tree5bb39ad7b744235495831856d4c1d5aa4635c3d0
parented736890d6a71606e1833a9707da52322f4e046e
parent1384df641994bf3d6cb51084290aa94752737bae
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>
doc/APIchanges
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h