Merge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 21:37:19 +0000 (23:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 21:42:37 +0000 (23:42 +0200)
* commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575':
  avcodec/fic: fix slice checks

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

Trivial merge