Commit 1549ca42 authored by Derek Buitenhuis's avatar Derek Buitenhuis

Merge commit '75b90ef7'

* commit '75b90ef7':
  libavformat: Update the comment about AVOutputFormat flags
Merged-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parents ee96b7b1 75b90ef7
...@@ -527,7 +527,7 @@ typedef struct AVOutputFormat { ...@@ -527,7 +527,7 @@ typedef struct AVOutputFormat {
* can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER,
* AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS, * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
* AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH, * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
* AVFMT_TS_NONSTRICT * AVFMT_TS_NONSTRICT, AVFMT_TS_NEGATIVE
*/ */
int flags; int flags;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment