Merge commit '521dc78366c6ea54b7b69426dab302a57231f81e'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 16:56:22 +0000 (16:56 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 16:56:22 +0000 (16:56 +0000)
commit895b888f1606eb734c9ad16862c205a260cf622c
treef694cf40b46dff7cddf70ee1fc3f3c75a37397ab
parente5fe75ae2bd47b7f6aa14c87f4d7c6ec4262c2cb
parent521dc78366c6ea54b7b69426dab302a57231f81e
Merge commit '521dc78366c6ea54b7b69426dab302a57231f81e'

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