Commit 68a06a24 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '724cbea7'

* commit '724cbea7':
  movenc: Remove an unnecessary condition when flushing fragments
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7ca10d10 724cbea7
...@@ -3836,7 +3836,7 @@ static int mov_flush_fragment(AVFormatContext *s) ...@@ -3836,7 +3836,7 @@ static int mov_flush_fragment(AVFormatContext *s)
if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) if (!(mov->flags & FF_MOV_FLAG_FRAGMENT))
return 0; return 0;
if (!(mov->flags & FF_MOV_FLAG_EMPTY_MOOV) && mov->fragments == 0) { if (mov->fragments == 0) {
int64_t pos = avio_tell(s->pb); int64_t pos = avio_tell(s->pb);
uint8_t *buf; uint8_t *buf;
int buf_size, moov_size; int buf_size, moov_size;
......
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