Merge commit 'ca489564ae150bc41764f175b88151d883e69ae0'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:41:51 +0000 (17:41 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:41:51 +0000 (17:41 +0000)
commit64db3639af7bfe9a5eec6755daf4e52556f3c141
treef82936e5b506f6a440cb0497a5b1b8663e6155b6
parentfe20e34b139fde727d23c7f50c310e11567bcc5f
parentca489564ae150bc41764f175b88151d883e69ae0
Merge commit 'ca489564ae150bc41764f175b88151d883e69ae0'

* commit 'ca489564ae150bc41764f175b88151d883e69ae0':
  movenc: add fallback audio track tref support

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/movenc.c