[FFmpeg-cvslog] Merge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 23:52:22 2014 +0200| [e0cdc68bdc0ee688b5e819d12ff151374f0cc988] | committer: Michael Niedermayer

Merge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9'

* commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9':
  avcodec/fic: clear slice_data

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

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