mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
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 56d2154b72
Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
24204eae1c