diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-10 10:08:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-10 10:08:38 +0200 |
| commit | ada9b17e7a3d63b5c58d493006d7b17aa2617813 (patch) | |
| tree | e80c33fea9a15626b97145a6ea2d61c009552f11 | |
| parent | 16ae64ce244a975dc160bef30905de27a8dd34aa (diff) | |
| parent | 8b524ab0c43c1767919530abb79d3656113cdc47 (diff) | |
Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'
* commit '8b524ab0c43c1767919530abb79d3656113cdc47':
movenc: Add a warning message if conflicting options have been specified
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/movenc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 5d231c9705..d23b1a1a3e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3610,9 +3610,11 @@ static int mov_write_header(AVFormatContext *s) /* faststart: moov at the beginning of the file, if supported */ if (mov->flags & FF_MOV_FLAG_FASTSTART) { if ((mov->flags & FF_MOV_FLAG_FRAGMENT) || - (s->flags & AVFMT_FLAG_CUSTOM_IO)) + (s->flags & AVFMT_FLAG_CUSTOM_IO)) { + av_log(s, AV_LOG_WARNING, "The faststart flag is incompatible " + "with fragmentation and custom IO, disabling faststart\n"); mov->flags &= ~FF_MOV_FLAG_FASTSTART; - else + } else mov->reserved_moov_size = -1; } |