diff options
author | James Almer <jamrial@gmail.com> | 2017-11-11 17:15:09 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-11-11 17:15:09 -0300 |
commit | 24204eae1c7dba402d88f0cd3077814dbb7f9376 (patch) | |
tree | 9ee5db73d5bc13ad7c90c1affb84334f21a7869b /libavfilter/vf_lut3d.c | |
parent | e5233b15814d808997594ae2cb14ad1513ff2d0d (diff) | |
parent | 762ab2de6ead68cfe6617d1960921878ddece9e1 (diff) | |
download | ffmpeg-24204eae1c7dba402d88f0cd3077814dbb7f9376.tar.gz |
Merge commit '762ab2de6ead68cfe6617d1960921878ddece9e1'
* commit '762ab2de6ead68cfe6617d1960921878ddece9e1':
Remove dv1394 input device
avfoundation: Drop silly _dec suffix from filename
alsa: Coalesce source files after outdev removal
oss: Coalesce source files after outdev removal
sndio: Coalesce source files after outdev removal
This commit is a noop, see 56d2154b72fba96a65b806ecf4a6f85c3f69b021
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/vf_lut3d.c')
0 files changed, 0 insertions, 0 deletions