Merge commit '59c6509d9f0236acbc317198eab76dab8320bced'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:42:42 +0000 (11:42 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:42:42 +0000 (11:42 +0200)
commit9afa64dfdffdf2ce80fc9e7d1e3e0091d0c2eb3b
treee91a05b1bc184ca869232a4d5e038634fc7dbb57
parentf755aa5ebdb8cbc036dd7841d2574906b7ce4195
parent59c6509d9f0236acbc317198eab76dab8320bced
Merge commit '59c6509d9f0236acbc317198eab76dab8320bced'

* commit '59c6509d9f0236acbc317198eab76dab8320bced':
  mss2: Drop a silly assert

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/mss2.c