[FFmpeg-cvslog] Merge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 23:37:19 2014 +0200| [359a719f5fb15051bb94f7c389efacedfc3599b2] | committer: Michael Niedermayer

Merge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575'

* commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575':
  avcodec/fic: fix slice checks

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

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