[FFmpeg-cvslog] Merge commit '75b90ef722b7cdfc70118ab987e298d087aae693'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu May 12 14:27:49 2016 +0100| [1549ca42672feb7a19abe2593a3a9ed891dfdd90] | committer: Derek Buitenhuis

Merge commit '75b90ef722b7cdfc70118ab987e298d087aae693'

* commit '75b90ef722b7cdfc70118ab987e298d087aae693':
  libavformat: Update the comment about AVOutputFormat flags

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1549ca42672feb7a19abe2593a3a9ed891dfdd90
---

 libavformat/avformat.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index f4b5c59..3eeeb9a 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -527,7 +527,7 @@ typedef struct AVOutputFormat {
      * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER,
      * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
      * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
-     * AVFMT_TS_NONSTRICT
+     * AVFMT_TS_NONSTRICT, AVFMT_TS_NEGATIVE
      */
     int flags;
 


======================================================================