-
Michael Niedermayer authored
* qatar/master: vf_fieldorder: require write permissions vf_fieldorder: reindent Conflicts: libavfilter/vf_fieldorder.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
1eb8809a
* qatar/master:
vf_fieldorder: require write permissions
vf_fieldorder: reindent
Conflicts:
libavfilter/vf_fieldorder.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>