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)
* 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>

Trivial merge