Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 11:20:01 +0000 (12:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 11:20:06 +0000 (12:20 +0100)
commit3ddf76ee070d072ed4cdeb7ec6585cea3e4b72eb
treed9fb8ca45f6644331e4b7d06d403026f36397d0a
parent1f36ebf63a8d6ffccf4bf286849d77f76aad8b8f
parent54bbe3e2a645b4f7b36efac2bca331d3be98592a
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Revert "Allow stream-copying grayscale mov files."

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c