aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-29 02:54:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-29 02:54:50 +0100
commit1eb8809a4178b180045d920d45727328186103c5 (patch)
tree7905671fd986e6c1ccfd82fec0895965ed95eda7 /libavdevice
parent87b9dc098240e72c8874e2d3a75e954cd56dc776 (diff)
parent4c973de9a5b67615762cf99ec20a8a633e64c4b8 (diff)
downloadffmpeg-1eb8809a4178b180045d920d45727328186103c5.tar.gz
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>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions