projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 643e336 fbd6317)
Merge commit 'fbd63170bcbc5cad8965edad7c357f6eb4132250'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 20:45:37 +0000 (17:45 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 20:45:37 +0000 (17:45 -0300)
* commit 'fbd63170bcbc5cad8965edad7c357f6eb4132250':
  cbs: Add test dependencies
  mss1: Add missing macro parameters to ARITH_GET_* macros

This commit is a noop, see
cbeaf678889baeaac0776305f3ca289318a1aca7
809b0402dc916b876dfdd6bb9c88f171cf3e77c0

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge
FFmpeg git repo