Merge commit '4f7723cb3b913c577842a5bb088c804ddacac8df'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 13:54:51 +0000 (14:54 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 13:54:51 +0000 (14:54 +0100)
commit4a485daa7fc50fe5eac7a3fc7ce7d83081fa00e1
tree460464649b4c54fd892b4cd1261e034acb82bfe2
parent55a424c5a836523828b3b2f02b7db610e898b3fc
parent4f7723cb3b913c577842a5bb088c804ddacac8df
Merge commit '4f7723cb3b913c577842a5bb088c804ddacac8df'

* commit '4f7723cb3b913c577842a5bb088c804ddacac8df':
  movenc: Add an option for skipping writing the mfra/tfra/mfro trailer

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