FFmpeg/libavformat/options_table.h at a46a23d30fea9c8a5570e07ec4d9c9b4eaa6eb4f

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00

Files

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: 3ba0dab76a
See: a89c012531
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-11-07 23:09:30 +01:00

10 KiB

Raw Blame History

View Raw

10 KiB Raw Blame History

10 KiB

Raw Blame History