Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Dec 2013 14:44:39 +0000 (15:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Dec 2013 14:44:45 +0000 (15:44 +0100)
commit1d0995e3a59eb37509888cfc7c2b173fd3dbb4f7
tree822849c4e7d30bc82d85d3a033b9781915a21680
parent47eb15b989a0bbeef6647ec97d9ee646cb8e901a
parentfb5518cfb76af414a46366f74bffb5874bf3bfc4
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Force one stream in caf muxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>