[FFmpeg-cvslog] Merge commit '6f243b17c537646b894857d43dfdac65f85ab377'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 23:53:21 2014 +0200| [60fdf7dd9ea6e501834c7cdc3651fb68ce472e3a] | committer: Michael Niedermayer

Merge commit '6f243b17c537646b894857d43dfdac65f85ab377'

* commit '6f243b17c537646b894857d43dfdac65f85ab377':
  avcodec/fic: Fix return value check

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

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