aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_lut3d.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-15 13:01:32 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-15 13:03:01 +0100
commit228fded03622f9b14df7fca45ef6fab089582c08 (patch)
tree361b7cc9ac55f8312a3726c47b5442d4d6d2b0c3 /libavfilter/vf_lut3d.c
parentd2f9b9da03626bf94dac27d471114b867bacb1ed (diff)
parentbab8d73765238bfeea7a8dfd454f40ac213b3d22 (diff)
downloadffmpeg-228fded03622f9b14df7fca45ef6fab089582c08.tar.gz
Merge commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22'
* commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22': vaapi: wrap codec specific functions in appropiate #ifs Conflicts: libavcodec/vaapi.c See: f2118d44c9f18b3245bec2415c563d94201dcf5a Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_lut3d.c')
0 files changed, 0 insertions, 0 deletions