Merge change I8b58bac2 into eclair

* changes:
  2226576 [RIO-7913] crash in the software mpeg4 decoder