projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5233b1 762ab2d)
Merge commit '762ab2de6ead68cfe6617d1960921878ddece9e1'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 20:15:09 +0000 (17:15 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 20:15:09 +0000 (17:15 -0300)
* 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>

Trivial merge
FFmpeg git repo