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)
* cehoyos/master:
  Revert "Allow stream-copying grayscale mov files."

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

Simple merge