Merge commit '724cbea7193945fe5a5b4dea8ede344803572844'

* commit '724cbea7193945fe5a5b4dea8ede344803572844':
  movenc: Remove an unnecessary condition when flushing fragments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/101/head
Michael Niedermayer 10 years ago
commit 68a06a244c
  1. 2
      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;

Loading…
Cancel
Save