aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/alldevices.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-10 21:54:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-10 22:13:34 +0200
commit8bdb119197ad50a5ede2326e3c0942dc82ba1b5e (patch)
treece0330a1a97e2cea6018e76010d41b7dc8fd7b2f /libavdevice/alldevices.c
parent94ec709e3bdd37368ecfc2973ff931fa4cb775c0 (diff)
parent20b46f8f4fff6aeeab9ea418dc359eda8887ced6 (diff)
downloadffmpeg-8bdb119197ad50a5ede2326e3c0942dc82ba1b5e.tar.gz
Merge commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6'
* commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6': vf_lut: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_lut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alldevices.c')
0 files changed, 0 insertions, 0 deletions