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 /doc/APIchanges | |
| parent | ed736890d6a71606e1833a9707da52322f4e046e (diff) | |
| parent | 1384df641994bf3d6cb51084290aa94752737bae (diff) | |
| download | ffmpeg-streaming-66e49ff3b923c6feee8e6e3d73ae3c76708aa5f2.zip ffmpeg-streaming-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 'doc/APIchanges')
| -rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 004a4b4..7c5ab9b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -899,6 +899,9 @@ lavd 54.4.100 / 54.0.0, lavfi 3.5.0 avresample_read() are now uint8_t** instead of void**. Libavresample is now stable. +2012-09-26 - 3ba0dab7 / 1384df64 - lavf 54.29.101 / 56.06.3 - avformat.h + Add AVFormatContext.avoid_negative_ts. + 2012-09-24 - 46a3595 / a42aada - lavc 54.59.100 / 54.28.0 - avcodec.h Add avcodec_free_frame(). This function must now be used for freeing an AVFrame. |
