diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 01:25:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 01:25:30 +0100 |
| commit | 68a06a244c06cd7caa6ed724c7cfbd2dbd7725b8 (patch) | |
| tree | def46ebee0a6a827118b0c62485e0549412e3433 | |
| parent | 7ca10d10aae32fa42b6afc486328a7ec017bd457 (diff) | |
| parent | 724cbea7193945fe5a5b4dea8ede344803572844 (diff) | |
| download | ffmpeg-68a06a244c06cd7caa6ed724c7cfbd2dbd7725b8.tar.gz | |
Merge commit '724cbea7193945fe5a5b4dea8ede344803572844'
* commit '724cbea7193945fe5a5b4dea8ede344803572844':
movenc: Remove an unnecessary condition when flushing fragments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index e9256f8ce4..7f6f70a26c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3836,7 +3836,7 @@ static int mov_flush_fragment(AVFormatContext *s) if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) return 0; - if (!(mov->flags & FF_MOV_FLAG_EMPTY_MOOV) && mov->fragments == 0) { + if (mov->fragments == 0) { int64_t pos = avio_tell(s->pb); uint8_t *buf; int buf_size, moov_size; |