Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 May 2015 23:26:30 +0000 (01:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 May 2015 23:26:36 +0000 (01:26 +0200)
commit737b0ca65b485a85ab1996241be05d08d1878682
treec4a51a82f3fec6d1216143d243d7dcf47574a1fa
parent592b053c7bacde6d13fe69bffd5b1b3b71fa1ca9
parent209e91cbc4e1c4feaa3b7c2671b864b77874eff8
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/qdrw: Do not fail decoding valid Quickdraw images.
  lavf/mov: Use AVCOL_SPC constants when checking color_space.
  lavf/mov: Write colour matrix "6" for color_space bt470bg.
  lavf/mkv: Only skip prores header if the packet is large enough.

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