Skip to content
Snippets Groups Projects
Commit 66e49ff3 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '1384df64' 


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

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

See: 3ba0dab7
See: a89c0125
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ed736890 1384df64
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment