diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-07 22:59:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-07 23:09:30 +0100 |
| commit | 66e49ff3b923c6feee8e6e3d73ae3c76708aa5f2 (patch) | |
| tree | 5bb39ad7b744235495831856d4c1d5aa4635c3d0 /libavcodec/012v.c | |
| parent | ed736890d6a71606e1833a9707da52322f4e046e (diff) | |
| parent | 1384df641994bf3d6cb51084290aa94752737bae (diff) | |
| download | ffmpeg-66e49ff3b923c6feee8e6e3d73ae3c76708aa5f2.tar.gz | |
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>
Diffstat (limited to 'libavcodec/012v.c')
0 files changed, 0 insertions, 0 deletions