* qatar/master:
  vf_fieldorder: require write permissions
  vf_fieldorder: reindent

Conflicts:
	libavfilter/vf_fieldorder.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>