Merge commit '7cb66ebc0be48489785f7166c9d15eac594b0763'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:30:31 +0000 (21:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:30:31 +0000 (21:30 +0200)
commitf6ff1cb1bae5d457dccc9540288b90d44e824ee1
tree087d3f24d4603982f1fc13c67162a89db1ebdc45
parent24e81a0a8d86e764dfb89cb21e9caa4aff073e1c
parent7cb66ebc0be48489785f7166c9d15eac594b0763
Merge commit '7cb66ebc0be48489785f7166c9d15eac594b0763'

* commit '7cb66ebc0be48489785f7166c9d15eac594b0763':
  error_resilience: Drop asserts from guess_mv()

Conflicts:
libavcodec/error_resilience.c

Not merged, the asserts in FFmpeg build and work fine

Merged-by: Michael Niedermayer <michaelni@gmx.at>