Merge commit 'ee37620b6ae4783cda637408422044b2d14a688c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Nov 2014 10:27:17 +0000 (11:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Nov 2014 10:27:17 +0000 (11:27 +0100)
commitb78074fd13ad340b8ea4bb83440da336a0de1e40
treeff8729c5be0ce419330d8b3dde03cfb327b0b7a5
parent5f30522894d19a14324b80bc282c094dabdb31c0
parentee37620b6ae4783cda637408422044b2d14a688c
Merge commit 'ee37620b6ae4783cda637408422044b2d14a688c'

* commit 'ee37620b6ae4783cda637408422044b2d14a688c':
  movenc: Add a flag for indicating a discontinuous fragment

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c
libavformat/movenc.h