aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_lut3d.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-20 22:05:27 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-20 22:05:27 +0200
commit96504b3f72a7fad602fbbb06d85633c52ceaf8da (patch)
tree4df6ee9bbfd9aeebbf8a31deb21926c84b2b84b6 /libavfilter/vf_lut3d.c
parent70c648db8948b11a86699f22e883b7310ccae6ce (diff)
parentd6006dd9f0d4d01023359230212f1f9fa4800e5b (diff)
downloadffmpeg-96504b3f72a7fad602fbbb06d85633c52ceaf8da.tar.gz
Merge commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b'
* commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b': libvpxenc: Do not entangle coded_frame Conflicts: libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_lut3d.c')
0 files changed, 0 insertions, 0 deletions