This partly reverts 1c5e9551,
a change of behaviour that was not discussed.

The reason for the revert is that FFmpeg cares about bugreports.