Merge commit '6f243b17c537646b894857d43dfdac65f85ab377'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 21:53:21 +0000 (23:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 21:54:09 +0000 (23:54 +0200)
* commit '6f243b17c537646b894857d43dfdac65f85ab377':
  avcodec/fic: Fix return value check

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

Trivial merge