Merge commit 'b8b21dee0f0b4bcc1888067c497d6e838859d2cd'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 13:49:24 +0000 (14:49 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 13:49:24 +0000 (14:49 +0100)
* commit 'b8b21dee0f0b4bcc1888067c497d6e838859d2cd':
  mxfenc: always assume long gop

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/mxfenc.c

Simple merge