]> git.sesse.net Git - ffmpeg/commit
Merge commit '19c5fa9eea47d45b5eedce3bff4edeaf83fb3942'
authorJames Almer <jamrial@gmail.com>
Sat, 28 Oct 2017 17:01:05 +0000 (14:01 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 28 Oct 2017 17:01:05 +0000 (14:01 -0300)
commitf4bda7e305385d080e233a79a578c0db926aa10d
treecfa232ec6887376fff920ca1650412d4b9094559
parent1d348dd03fb485b9c62904734cde11a2f4813f37
parent19c5fa9eea47d45b5eedce3bff4edeaf83fb3942
Merge commit '19c5fa9eea47d45b5eedce3bff4edeaf83fb3942'

* commit '19c5fa9eea47d45b5eedce3bff4edeaf83fb3942':
  golomb: Simplify get_ur_golomb_jpegls

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

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