Merge commit '9cce011b1d2f66366f5d75a024c2a2f93dc2b589'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 16:57:24 +0000 (16:57 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 16:57:24 +0000 (16:57 +0000)
commit257766a838c5359558a7745d39d570d78eeecd76
tree806dec31d080b01328f6418350214ebe6b066b19
parent895b888f1606eb734c9ad16862c205a260cf622c
parent9cce011b1d2f66366f5d75a024c2a2f93dc2b589
Merge commit '9cce011b1d2f66366f5d75a024c2a2f93dc2b589'

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