Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 21:09:10 +0000 (22:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 21:09:10 +0000 (22:09 +0100)
commit4ba03e37fd169ca444bc7c5ca330363584afff1e
tree13ee0988e99f10e519e0493d09cd0643e59633d3
parentca5b45b9b3cb488e6b7d76a7db8befff98acf640
parent93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd
Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'

* commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd':
  doc: Name the MOV muxer as it should be called

Conflicts:
doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/muxers.texi