[FFmpeg-cvslog] Merge commit '7cb66ebc0be48489785f7166c9d15eac594b0763'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 21 21:30:31 2014 +0200| [f6ff1cb1bae5d457dccc9540288b90d44e824ee1] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6ff1cb1bae5d457dccc9540288b90d44e824ee1
---