diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 14:27:49 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 14:27:54 +0100 |
| commit | 1549ca42672feb7a19abe2593a3a9ed891dfdd90 (patch) | |
| tree | 8a3330f49394a393aa8afed42728c821d3ff3e8a | |
| parent | ee96b7b1c656434b35f3d2dc73ae65e723aa5d2a (diff) | |
| parent | 75b90ef722b7cdfc70118ab987e298d087aae693 (diff) | |
| download | ffmpeg-streaming-1549ca42672feb7a19abe2593a3a9ed891dfdd90.zip ffmpeg-streaming-1549ca42672feb7a19abe2593a3a9ed891dfdd90.tar.gz | |
Merge commit '75b90ef722b7cdfc70118ab987e298d087aae693'
* commit '75b90ef722b7cdfc70118ab987e298d087aae693':
libavformat: Update the comment about AVOutputFormat flags
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavformat/avformat.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |
