Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 01:54:50 +0000 (02:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 01:54:50 +0000 (02:54 +0100)
commit1eb8809a4178b180045d920d45727328186103c5
tree7905671fd986e6c1ccfd82fec0895965ed95eda7
parent87b9dc098240e72c8874e2d3a75e954cd56dc776
parent4c973de9a5b67615762cf99ec20a8a633e64c4b8
Merge remote-tracking branch 'qatar/master'

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

Conflicts:
libavfilter/vf_fieldorder.c

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